From 93ff09d081d2fb6d2732ad8d6522517508ae31ed Mon Sep 17 00:00:00 2001
From: tipaul <tipaul>
Date: Tue, 1 Mar 2005 13:40:35 +0000
Subject: [PATCH] merging 2.2 branch with head. Sorry for not making it before,
 many many commits done here

---
 C4/Acquisition.pm                             |    2 +-
 C4/AuthoritiesMarc.pm                         |   36 +-
 C4/Biblio.pm                                  |   89 +-
 C4/Bull.pm                                    |   75 +-
 C4/Circulation/Circ2.pm                       |    2 +-
 C4/Context.pm                                 |    1 +
 C4/Search.pm                                  |   39 +-
 C4/SearchMarc.pm                              |   41 +-
 ISBDdetail.pl                                 |   27 +-
 MARCdetail.pl                                 |   34 +-
 about.pl                                      |    1 +
 acqui.simple/addbiblio.pl                     |   10 +-
 acqui/addorder.pl                             |    3 -
 admin/auth_subfields_structure.pl             |    2 +-
 admin/auth_tag_structure.pl                   |    5 +-
 admin/marc_subfields_structure.pl             |    6 +-
 admin/marctagstructure.pl                     |   23 +-
 authorities/auth_finder.pl                    |   16 +-
 authorities/authorities-home.pl               |    2 +-
 bull-home.pl                                  |    3 +-
 bull/statecollection.pl                       |    2 +-
 bull/subscription-detail.pl                   |   11 +-
 circ/circulation.pl                           |    2 +-
 detail.pl                                     |  124 +-
 koha-tmpl/intranet-tmpl/default/en/about.tmpl |   42 +-
 .../default/en/acqui.simple/addbiblio.tmpl    |   20 +-
 .../default/en/acqui/basket.tmpl              |   10 +-
 .../default/en/acqui/histsearch.tmpl          |    8 +
 .../default/en/acqui/newbiblio.tmpl           |   35 +-
 .../default/en/acqui/supplier.tmpl            |   16 +-
 .../default/en/authorities/auth_finder.tmpl   |   22 +-
 .../en/authorities/authorities-home.tmpl      |   22 +-
 .../en/authorities/searchresultlist-auth.tmpl |   22 +-
 .../default/en/bull/bull-home.tmpl            |    2 +-
 .../intranet-tmpl/default/en/bull/result.tmpl |   14 +-
 .../default/en/bull/subscription-detail.tmpl  |    3 +
 .../default/en/catalogue/MARCdetail.tmpl      |    9 +-
 .../default/en/catalogue/detail.tmpl          |   74 +-
 .../default/en/circ/circulation.tmpl          |   15 +-
 .../intranet-tmpl/default/en/export/marc.tmpl |   26 +-
 .../default/en/help/search.marc/search.tmpl   |    3 +-
 .../default/en/members/member.tmpl            |    5 +
 .../default/en/members/memberentry.tmpl       |    5 +-
 .../default/en/members/members-home.tmpl      |    7 +-
 .../default/en/members/moremember-print.tmpl  |   61 +
 .../en/members/moremember-receipt.tmpl        |   42 +
 .../default/en/members/moremember.tmpl        |   98 +-
 .../default/en/members/readingrec.tmpl        |    9 +-
 .../en/parameters/auth_tag_structure.tmpl     |    1 +
 .../default/en/parameters/categorie.tmpl      |    4 -
 .../default/en/parameters/issuingrules.tmpl   |    4 +-
 .../default/en/parameters/itemtypes.tmpl      |   16 +-
 .../parameters/marc_subfields_structure.tmpl  |    2 +-
 .../default/en/search.marc/result.tmpl        |    6 +-
 .../en/value_builder/unimarc_field_100.tmpl   |    2 +-
 .../en/value_builder/unimarc_field_116.tmpl   |    8 +-
 .../en/value_builder/unimarc_field_126a.tmpl  |   24 +-
 koha-tmpl/intranet-tmpl/default/fr/about.tmpl |   48 +-
 .../fr/acqui.simple/addbiblio-nomarc.tmpl     |    2 +-
 .../default/fr/acqui.simple/addbiblio.tmpl    |   22 +-
 .../default/fr/acqui.simple/addbooks.tmpl     |    2 +-
 .../default/fr/acqui.simple/additem.tmpl      |    4 +-
 .../default/fr/acqui.simple/isbnsearch.tmpl   |    8 +-
 .../default/fr/acqui/acqui-home.tmpl          |    2 +-
 .../default/fr/acqui/acquire.tmpl             |    2 +-
 .../default/fr/acqui/histsearch.tmpl          |    8 +
 .../default/fr/acqui/newbasket2.tmpl          |    2 +-
 .../default/fr/acqui/newbiblio.tmpl           |    2 +-
 .../default/fr/authorities/authorities.tmpl   |    4 +-
 .../default/fr/barcodes/barcodes-top.inc      |    2 +-
 .../default/fr/barcodes/barcodes.tmpl         |  359 +-
 .../default/fr/bull/bull-home.tmpl            |    2 +-
 .../intranet-tmpl/default/fr/bull/result.tmpl |   14 +-
 .../intranet-tmpl/default/fr/bull/search.tmpl |    2 +-
 .../default/fr/bull/subscription-add.tmpl     |    2 +-
 .../default/fr/bull/subscription-detail.tmpl  |    3 +
 .../default/fr/catalogue/MARCdetail.tmpl      |   48 +-
 .../default/fr/catalogue/detail.tmpl          |   68 +-
 .../default/fr/catalogue/searchresults.tmpl   |    2 +-
 .../default/fr/circ/circulation.tmpl          |   17 +-
 .../default/fr/circ/selectbranchprinter.tmpl  |    2 +-
 .../intranet-tmpl/default/fr/errors/400.tmpl  |   15 +-
 .../intranet-tmpl/default/fr/errors/401.tmpl  |   15 +-
 .../intranet-tmpl/default/fr/errors/402.tmpl  |   15 +-
 .../intranet-tmpl/default/fr/errors/403.tmpl  |   15 +-
 .../intranet-tmpl/default/fr/errors/404.tmpl  |   15 +-
 .../intranet-tmpl/default/fr/errors/405.tmpl  |   15 +-
 .../intranet-tmpl/default/fr/errors/500.tmpl  |   17 +-
 .../intranet-tmpl/default/fr/export/marc.tmpl |   24 +-
 .../default/fr/help/admin/aqbookfund.tmpl     |    8 +-
 .../fr/help/admin/biblio_framework.tmpl       |    4 +-
 .../default/fr/help/admin/categorie.tmpl      |   16 +-
 .../default/fr/help/admin/checkmarc.tmpl      |    2 +-
 .../default/fr/help/admin/currency.tmpl       |    2 +-
 .../default/fr/help/admin/issuingrules.tmpl   |    2 +-
 .../default/fr/help/admin/itemtypes.tmpl      |    6 +-
 .../default/fr/help/admin/koha2marclinks.tmpl |    6 +-
 .../help/admin/marc_subfields_structure.tmpl  |   10 +-
 .../fr/help/admin/marctagstructure.tmpl       |   10 +-
 .../fr/help/admin/systempreferences.tmpl      |   31 +-
 .../default/fr/help/admin/z3950servers.tmpl   |    4 +-
 .../default/fr/help/bull/statecollection.tmpl |    2 +-
 .../default/fr/help/circ/circulation.tmpl     |    4 +-
 .../default/fr/help/circ/returns.tmpl         |    3 +-
 .../default/fr/help/export/marc.tmpl          |    4 +-
 .../default/fr/help/import/breeding.tmpl      |    8 +-
 .../default/fr/help/search.marc/search.tmpl   |    9 +-
 .../default/fr/includes/auth-top.inc          |    2 +-
 .../default/fr/includes/bull-top.inc          |    2 +-
 .../default/fr/includes/parameters-top.inc    |    2 +-
 .../default/fr/intranet-main.tmpl             |    6 +-
 .../default/fr/members/member-flags.tmpl      |    2 +-
 .../default/fr/members/member.tmpl            |    6 +-
 .../default/fr/members/memberentry.tmpl       |    5 +-
 .../default/fr/members/members-home.tmpl      |    6 +-
 .../default/fr/members/moremember.tmpl        |  120 +-
 .../default/fr/members/newjmember.tmpl        |    4 +-
 .../default/fr/members/newmember.tmpl         |    2 +-
 .../default/fr/members/readingrec.tmpl        |   11 +-
 .../default/fr/parameters/admin-home.tmpl     |    4 +-
 .../default/fr/parameters/aqbookfund.tmpl     |    2 +-
 .../default/fr/parameters/aqbudget.tmpl       |    2 +-
 .../parameters/auth_subfields_structure.tmpl  |   16 +-
 .../fr/parameters/auth_tag_structure.tmpl     |    5 +-
 .../fr/parameters/biblio_framework.tmpl       |    2 +-
 .../default/fr/parameters/categorie.tmpl      |   22 +-
 .../default/fr/parameters/categoryitem.tmpl   |   10 +-
 .../default/fr/parameters/currency.tmpl       |    2 +-
 .../default/fr/parameters/issuingrules.tmpl   |    4 +-
 .../default/fr/parameters/itemtypes.tmpl      |   18 +-
 .../parameters/marc_subfields_structure.tmpl  |   30 +-
 .../fr/parameters/marctagstructure.tmpl       |    4 +-
 .../default/fr/parameters/printers.tmpl       |    8 +-
 .../default/fr/parameters/stopwords.tmpl      |    2 +-
 .../fr/parameters/systempreferences.tmpl      |    4 +-
 .../default/fr/parameters/z3950servers.tmpl   |    2 +-
 .../reports/issues_by_borrower_category.tmpl  |    2 +-
 .../default/fr/reports/reports-home.tmpl      |    2 +-
 .../default/fr/search.marc/search.tmpl        |    2 +-
 .../default/fr/updatebiblio.tmpl              |    2 +-
 .../fr/value_builder/unimarc_field_100.tmpl   |   42 +-
 .../fr/value_builder/unimarc_field_105.tmpl   |   52 +-
 .../fr/value_builder/unimarc_field_106.tmpl   |    4 +-
 .../fr/value_builder/unimarc_field_110.tmpl   |   32 +-
 .../fr/value_builder/unimarc_field_115a.tmpl  |   68 +-
 .../fr/value_builder/unimarc_field_115b.tmpl  |   36 +-
 .../fr/value_builder/unimarc_field_116.tmpl   |   52 +-
 .../fr/value_builder/unimarc_field_117.tmpl   |   20 +-
 .../fr/value_builder/unimarc_field_120.tmpl   |   40 +-
 .../fr/value_builder/unimarc_field_121a.tmpl  |   40 +-
 .../fr/value_builder/unimarc_field_121b.tmpl  |   24 +-
 .../fr/value_builder/unimarc_field_122.tmpl   |    4 +-
 .../fr/value_builder/unimarc_field_123a.tmpl  |    4 +-
 .../fr/value_builder/unimarc_field_123d.tmpl  |    4 +-
 .../fr/value_builder/unimarc_field_123e.tmpl  |    4 +-
 .../fr/value_builder/unimarc_field_123f.tmpl  |    4 +-
 .../fr/value_builder/unimarc_field_123g.tmpl  |    4 +-
 .../fr/value_builder/unimarc_field_124a.tmpl  |    4 +-
 .../fr/value_builder/unimarc_field_124b.tmpl  |    4 +-
 .../fr/value_builder/unimarc_field_124c.tmpl  |    4 +-
 .../fr/value_builder/unimarc_field_124d.tmpl  |    4 +-
 .../fr/value_builder/unimarc_field_124e.tmpl  |    4 +-
 .../fr/value_builder/unimarc_field_124f.tmpl  |    4 +-
 .../fr/value_builder/unimarc_field_124g.tmpl  |    4 +-
 .../fr/value_builder/unimarc_field_125a.tmpl  |    8 +-
 .../fr/value_builder/unimarc_field_125b.tmpl  |    4 +-
 .../fr/value_builder/unimarc_field_126a.tmpl  |   84 +-
 .../fr/value_builder/unimarc_field_126b.tmpl  |   12 +-
 .../fr/value_builder/unimarc_field_128a.tmpl  |    4 +-
 .../fr/value_builder/unimarc_field_128b.tmpl  |    4 +-
 .../fr/value_builder/unimarc_field_128c.tmpl  |    4 +-
 .../fr/value_builder/unimarc_field_130.tmpl   |   32 +-
 .../fr/value_builder/unimarc_field_135a.tmpl  |    4 +-
 .../fr/value_builder/unimarc_field_140.tmpl   |   84 +-
 .../fr/value_builder/unimarc_field_141.tmpl   |   32 +-
 .../npl/en/includes/help-bottom.inc           |    3 +
 .../intranet-tmpl/npl/en/members/pay.tmpl     |   21 +-
 .../npl/en/parameters/marctagstructure.tmpl   |  179 +-
 .../en/acqui.simple/addbiblio-nomarc.tmpl     |   88 -
 .../unido/en/acqui.simple/addbooks.tmpl       |   79 -
 .../unido/en/acqui.simple/additem-nomarc.tmpl |  197 -
 .../en/acqui.simple/addperiodical-nomarc.tmpl |  174 -
 .../unido/en/acqui.simple/isbnsearch.tmpl     |  104 -
 .../unido/en/catalogue/MARCdetail.tmpl        |  258 --
 .../unido/en/catalogue/catalogue-home.tmpl    |  148 -
 .../unido/en/catalogue/detail.tmpl            |  238 --
 .../unido/en/catalogue/moredetail.tmpl        |  136 -
 .../unido/en/catalogue/searchresults.tmpl     |  113 -
 .../unido/en/catalogue/subject.tmpl           |   35 -
 .../intranet-tmpl/unido/en/circ/returns.tmpl  |  252 --
 .../unido/en/images/intranet-logo.gif         |  Bin 1669 -> 0 bytes
 .../unido/en/images/unido-intranet-photos.jpg |  Bin 26066 -> 0 bytes
 .../unido/en/includes/2-column-end.inc        |    0
 .../unido/en/includes/3-column-end.inc        |    0
 .../unido/en/includes/3-column-seperator.inc  |    0
 .../unido/en/includes/acquisitions-bottom.inc |   14 -
 .../unido/en/includes/acquisitions-top.inc    |  122 -
 .../unido/en/includes/cat-bottom.inc          |   14 -
 .../unido/en/includes/cat-top.inc             |  111 -
 .../unido/en/includes/general-end.inc         |   14 -
 .../includes/general-first-column-divider.inc |    0
 .../unido/en/includes/general-top.inc         |    6 -
 .../unido/en/includes/home-modern.css         |   32 -
 .../intranet-tmpl/unido/en/includes/login.inc |    0
 .../intranet-tmpl/unido/en/includes/main.css  |  418 --
 .../unido/en/includes/members-bottom.inc      |   14 -
 .../unido/en/includes/members-top.inc         |  117 -
 .../intranet-tmpl/unido/en/intranet-main.tmpl |  134 -
 .../unido/en/members/memberentry.tmpl         |  173 -
 .../unido/en/members/members-home.tmpl        |   33 -
 .../unido/en/members/moremember.tmpl          |  186 -
 koha-tmpl/intranet-tmpl/unido/en/modbib.tmpl  |  108 -
 .../intranet-tmpl/unido/en/modbibitem.tmpl    |  111 -
 .../intranet-tmpl/unido/en/newmember.tmpl     |  229 --
 .../css/en/images/front-background-small.gif  |  Bin 1426 -> 1552 bytes
 koha-tmpl/opac-tmpl/css/en/includes/basket.js |    5 +
 .../css/en/includes/opac-basket-menu.inc      |    6 +
 .../css/en/includes/opac-basket-top.inc       |    1 +
 .../opac-tmpl/css/en/includes/opac-top.inc    |    1 +
 koha-tmpl/opac-tmpl/css/en/includes/opac.css  |   38 +-
 .../css/en/includes/popup-bottom.inc          |    2 +
 .../opac-tmpl/css/en/includes/popup-top.inc   |   15 +
 koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl   |  110 +-
 koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl   |   63 +-
 koha-tmpl/opac-tmpl/css/en/opac-main.tmpl     |    1 +
 koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl  |    3 +-
 koha-tmpl/opac-tmpl/css/en/opac-search.tmpl   |   35 +-
 .../opac-tmpl/css/en/opac-searchresults.tmpl  |   19 +-
 .../opac-tmpl/css/en/opac-serial-issues.tmpl  |   15 +-
 .../css/fr/images/front-background-small.gif  |  Bin 1426 -> 1552 bytes
 koha-tmpl/opac-tmpl/css/fr/includes/basket.js |    8 +
 .../css/fr/includes/opac-basket-menu.inc      |    6 +
 .../css/fr/includes/opac-basket-top.inc       |    1 +
 .../opac-tmpl/css/fr/includes/opac-bottom.inc |    2 +-
 .../opac-tmpl/css/fr/includes/opac-top.inc    |   13 +-
 koha-tmpl/opac-tmpl/css/fr/includes/opac.css  |   80 +-
 .../opac-tmpl/css/fr/opac-ISBDdetail.tmpl     |   10 +-
 .../opac-tmpl/css/fr/opac-MARCdetail.tmpl     |   14 +-
 koha-tmpl/opac-tmpl/css/fr/opac-auth.tmpl     |    8 +-
 koha-tmpl/opac-tmpl/css/fr/opac-basket.tmpl   |  114 +-
 koha-tmpl/opac-tmpl/css/fr/opac-detail.tmpl   |   54 +-
 .../opac-tmpl/css/fr/opac-detailprint.tmpl    |    2 +-
 koha-tmpl/opac-tmpl/css/fr/opac-main.tmpl     |   22 +-
 .../opac-tmpl/css/fr/opac-moredetail.tmpl     |   40 +-
 koha-tmpl/opac-tmpl/css/fr/opac-reserve.tmpl  |   27 +-
 koha-tmpl/opac-tmpl/css/fr/opac-search.tmpl   |   50 +-
 .../opac-tmpl/css/fr/opac-searchresults.tmpl  |   22 +-
 .../opac-tmpl/css/fr/opac-sendbasket.tmpl     |    6 +-
 .../opac-tmpl/css/fr/opac-sendbasketform.tmpl |   10 +-
 .../opac-tmpl/css/fr/opac-serial-issues.tmpl  |   21 +-
 koha-tmpl/opac-tmpl/css/fr/opac-shelves.tmpl  |  294 +-
 .../opac-tmpl/css/fr/opac-suggestions.tmpl    |   10 +-
 koha-tmpl/opac-tmpl/css/fr/opac-user.tmpl     |    4 +-
 .../opac-tmpl/css/fr/opac-userupdate.tmpl     |    4 +-
 koha-tmpl/opac-tmpl/npl/en/opac-auth.tmpl     |    2 +-
 koha-tmpl/opac-tmpl/npl/en/opac-main.tmpl     |    4 +-
 .../opac-tmpl/npl/en/opac-serial-issues.tmpl  |  104 +-
 koha-tmpl/opac-tmpl/npl/en/opac-shelves.tmpl  |  216 +-
 koha-tmpl/opac-tmpl/unido/en/about.tmpl       |   86 -
 koha-tmpl/opac-tmpl/unido/en/contact.tmpl     |   81 -
 .../unido/en/images/unido-home-photos.jpg     |  Bin 26212 -> 0 bytes
 .../opac-tmpl/unido/en/images/unido-logo.gif  |  Bin 902 -> 0 bytes
 .../opac-tmpl/unido/en/includes/crumb-end.inc |    1 -
 .../unido/en/includes/crumb-start.inc         |    4 -
 .../unido/en/includes/home-modern.css         |   32 -
 .../unido/en/includes/itemtype-image.inc      |   45 -
 .../opac-tmpl/unido/en/includes/koha.css      |  161 -
 .../opac-tmpl/unido/en/includes/main.css      |  361 --
 .../opac-tmpl/unido/en/includes/opac.css      |  222 --
 .../opac-tmpl/unido/en/includes/script.js     |    0
 .../unido/en/includes/vanilla-about-menu.inc  |   14 -
 .../unido/en/includes/vanilla-about-menu.tmpl |   86 -
 .../unido/en/includes/vanilla-botnav-all.inc  |    0
 .../unido/en/includes/vanilla-cat-search.inc  |    4 -
 .../en/includes/vanilla-contact-menu.tmpl     |   14 -
 .../unido/en/includes/vanilla-crumb-end.inc   |    1 -
 .../unido/en/includes/vanilla-crumb-start.inc |    4 -
 .../unido/en/includes/vanilla-end-main.inc    |    2 -
 .../unido/en/includes/vanilla-key.inc         |    1 -
 .../unido/en/includes/vanilla-left-nav.inc    |    6 -
 .../unido/en/includes/vanilla-logout.inc      |    4 -
 .../unido/en/includes/vanilla-main.css        |  485 ---
 .../unido/en/includes/vanilla-member-menu.inc |   14 -
 .../en/includes/vanilla-membership-botnav.inc |    4 -
 .../includes/vanilla-membership-left-nav.inc  |   64 -
 .../unido/en/includes/vanilla-menu.inc        |    6 -
 .../en/includes/vanilla-personal-details.inc  |   11 -
 .../unido/en/includes/vanilla-search-menu.inc |   14 -
 .../opac-tmpl/unido/en/opac-detail-all.tmpl   |  169 -
 .../opac-tmpl/unido/en/opac-detail-multi.tmpl |  101 -
 koha-tmpl/opac-tmpl/unido/en/opac-detail.tmpl |  208 -
 koha-tmpl/opac-tmpl/unido/en/opac-main.tmpl   |  140 -
 koha-tmpl/opac-tmpl/unido/en/opac-search.tmpl |  100 -
 .../opac-tmpl/vanilla/en/images/book.gif      |  Bin 1971 -> 0 bytes
 .../opac-tmpl/vanilla/en/images/circle.gif    |  Bin 1006 -> 0 bytes
 .../opac-tmpl/vanilla/en/images/disk.gif      |  Bin 1693 -> 0 bytes
 .../vanilla/en/images/dk-brown-dot.gif        |  Bin 43 -> 0 bytes
 koha-tmpl/opac-tmpl/vanilla/en/images/dvd.gif |  Bin 2393 -> 0 bytes
 .../opac-tmpl/vanilla/en/images/fine.gif      |  Bin 1498 -> 0 bytes
 .../vanilla/en/images/front-arrow.gif         |  Bin 294 -> 0 bytes
 .../en/images/front-background-med.gif        |  Bin 12385 -> 0 bytes
 .../vanilla/en/images/heading-login-2.gif     |  Bin 1140 -> 0 bytes
 .../vanilla/en/images/heading-login.gif       |  Bin 2475 -> 0 bytes
 .../vanilla/en/images/heading-member.gif      |  Bin 12926 -> 0 bytes
 .../vanilla/en/images/heading-search-2.gif    |  Bin 1245 -> 0 bytes
 .../vanilla/en/images/heading-search-3.gif    |  Bin 1306 -> 0 bytes
 .../vanilla/en/images/heading-search.gif      |  Bin 2524 -> 0 bytes
 .../opac-tmpl/vanilla/en/images/hltlogo.gif   |  Bin 99009 -> 0 bytes
 .../opac-tmpl/vanilla/en/images/holder.gif    |  Bin 43 -> 0 bytes
 .../opac-tmpl/vanilla/en/images/jigsaw.gif    |  Bin 1982 -> 0 bytes
 .../opac-tmpl/vanilla/en/images/koha.gif      |  Bin 4365 -> 0 bytes
 .../vanilla/en/images/large-print.gif         |  Bin 2127 -> 0 bytes
 .../opac-tmpl/vanilla/en/images/magazine.gif  |  Bin 1755 -> 0 bytes
 koha-tmpl/opac-tmpl/vanilla/en/images/map.gif |  Bin 1607 -> 0 bytes
 .../vanilla/en/images/picture-book.gif        |  Bin 2219 -> 0 bytes
 .../vanilla/en/images/place-reserve.jpg       |  Bin 9357 -> 0 bytes
 .../vanilla/en/images/search-button.gif       |  Bin 1600 -> 0 bytes
 .../vanilla/en/images/selected-circle.gif     |  Bin 1094 -> 0 bytes
 .../opac-tmpl/vanilla/en/images/sm-book.gif   |  Bin 410 -> 0 bytes
 .../opac-tmpl/vanilla/en/images/sm-disk.gif   |  Bin 1716 -> 0 bytes
 .../opac-tmpl/vanilla/en/images/sm-dvd.gif    |  Bin 1734 -> 0 bytes
 .../opac-tmpl/vanilla/en/images/sm-jigsaw.gif |  Bin 1832 -> 0 bytes
 .../vanilla/en/images/sm-lg-print.gif         |  Bin 1788 -> 0 bytes
 .../vanilla/en/images/sm-picture-book.gif     |  Bin 1756 -> 0 bytes
 .../opac-tmpl/vanilla/en/images/sm-tape.gif   |  Bin 1634 -> 0 bytes
 .../en/images/styles/home-go-button.gif       |  Bin 1311 -> 0 bytes
 .../vanilla/en/images/talking-book.gif        |  Bin 2002 -> 0 bytes
 .../opac-tmpl/vanilla/en/images/tan-dot.gif   |  Bin 43 -> 0 bytes
 .../opac-tmpl/vanilla/en/images/tape.gif      |  Bin 1059 -> 0 bytes
 .../en/images/vanilla-logout-button.gif       |  Bin 3368 -> 0 bytes
 .../vanilla/en/includes/crumb-end.inc         |    1 -
 .../vanilla/en/includes/crumb-start.inc       |    4 -
 .../vanilla/en/includes/itemtype-image.inc    |   45 -
 .../opac-tmpl/vanilla/en/includes/koha.css    |  161 -
 .../opac-tmpl/vanilla/en/includes/main.css    |  361 --
 .../opac-tmpl/vanilla/en/includes/opac.css    |  222 --
 .../opac-tmpl/vanilla/en/includes/script.js   |    0
 .../en/includes/vanilla-botnav-all.inc        |    0
 .../en/includes/vanilla-cat-search.inc        |    4 -
 .../vanilla/en/includes/vanilla-crumb-end.inc |    1 -
 .../en/includes/vanilla-crumb-start.inc       |    4 -
 .../vanilla/en/includes/vanilla-end-main.inc  |    2 -
 .../vanilla/en/includes/vanilla-key.inc       |    1 -
 .../vanilla/en/includes/vanilla-left-nav.inc  |    6 -
 .../vanilla/en/includes/vanilla-logout.inc    |    4 -
 .../vanilla/en/includes/vanilla-main.css      |  485 ---
 .../en/includes/vanilla-member-menu.inc       |   14 -
 .../en/includes/vanilla-membership-botnav.inc |    4 -
 .../includes/vanilla-membership-left-nav.inc  |   64 -
 .../vanilla/en/includes/vanilla-menu.inc      |    5 -
 .../en/includes/vanilla-personal-details.inc  |   11 -
 .../en/includes/vanilla-search-menu.inc       |   14 -
 koha-tmpl/opac-tmpl/vanilla/en/loggedin.tmpl  |   62 -
 .../opac-tmpl/vanilla/en/opac-account.tmpl    |   92 -
 koha-tmpl/opac-tmpl/vanilla/en/opac-auth.tmpl |  106 -
 .../opac-tmpl/vanilla/en/opac-detail.tmpl     |  143 -
 koha-tmpl/opac-tmpl/vanilla/en/opac-main.tmpl |  166 -
 .../opac-tmpl/vanilla/en/opac-membership.tmpl |   88 -
 .../vanilla/en/opac-readingrecord.tmpl        |   90 -
 .../opac-tmpl/vanilla/en/opac-reserve.tmpl    |  228 --
 .../opac-tmpl/vanilla/en/opac-search.tmpl     |  123 -
 .../vanilla/en/opac-searchresults.tmpl        |  140 -
 koha-tmpl/opac-tmpl/vanilla/en/opac-user.tmpl |  261 --
 .../vanilla/en/opac-userdetails.tmpl          |  170 -
 .../opac-tmpl/vanilla/en/opac-userupdate.tmpl |   95 -
 members/member.pl                             |    8 +-
 members/memberentry.pl                        |    2 +-
 misc/Install.pm                               |   89 +-
 misc/buildrelease                             |  126 +-
 misc/info/ChangeLog                           |  179 +
 misc/info/INSTALL                             |   40 +
 misc/info/README                              |   15 +-
 misc/koha.upgrade                             |    5 +-
 misc/merge_authority.pl                       |  116 +
 misc/migration_tools/build6xx.pl              |  245 ++
 misc/migration_tools/buildEDITORS.pl          |  249 ++
 misc/migration_tools/check_marc_definition.pl |   47 +
 misc/overduenotices.pl                        |  166 +-
 misc/rebuildnonmarc.pl                        |    1 +
 misc/release notes/release_notes_221.txt      |  286 ++
 misc/translator/Makefile                      |    5 +-
 misc/translator/po/css_opac_fr_FR.po          | 1787 +++++----
 misc/translator/po/css_opac_it_IT.po          | 1916 +++++++++
 misc/translator/po/css_opac_zh_TW.po          |  824 ++--
 misc/translator/po/default_intranet_fr_FR.po  | 2237 ++++++-----
 misc/translator/po/default_intranet_zh_TW.po  | 3471 ++++++++---------
 misc/translator/po/stats.pl                   |  122 +
 misc/translator/po/update.pl                  |   59 +
 misc/translator/translator_doc.html           |   35 +-
 misc/translator/translator_doc.txt            |   61 +-
 misc/translator/xgettext.pl                   |    5 +-
 opac/opac-ISBDdetail.pl                       |   27 +-
 opac/opac-MARCdetail.pl                       |   27 +-
 opac/opac-detail.pl                           |    7 +-
 opac/opac-reserve.pl                          |    5 +-
 opac/opac-serial-issues.pl                    |   46 +-
 opac/opac-shelves.pl                          |    8 +-
 plugin_launcher.pl                            |    9 +-
 renewscript.pl                                |    2 +-
 reports/manager.pl                            |    6 +-
 request.pl                                    |    3 +-
 value_builder/unimarc_field_225a.pl           |   11 +-
 402 files changed, 10970 insertions(+), 15351 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/default/en/members/moremember-print.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/default/en/members/moremember-receipt.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/npl/en/includes/help-bottom.inc
 delete mode 100644 koha-tmpl/intranet-tmpl/unido/en/acqui.simple/addbiblio-nomarc.tmpl
 delete mode 100644 koha-tmpl/intranet-tmpl/unido/en/acqui.simple/addbooks.tmpl
 delete mode 100644 koha-tmpl/intranet-tmpl/unido/en/acqui.simple/additem-nomarc.tmpl
 delete mode 100644 koha-tmpl/intranet-tmpl/unido/en/acqui.simple/addperiodical-nomarc.tmpl
 delete mode 100644 koha-tmpl/intranet-tmpl/unido/en/acqui.simple/isbnsearch.tmpl
 delete mode 100644 koha-tmpl/intranet-tmpl/unido/en/catalogue/MARCdetail.tmpl
 delete mode 100644 koha-tmpl/intranet-tmpl/unido/en/catalogue/catalogue-home.tmpl
 delete mode 100644 koha-tmpl/intranet-tmpl/unido/en/catalogue/detail.tmpl
 delete mode 100644 koha-tmpl/intranet-tmpl/unido/en/catalogue/moredetail.tmpl
 delete mode 100644 koha-tmpl/intranet-tmpl/unido/en/catalogue/searchresults.tmpl
 delete mode 100644 koha-tmpl/intranet-tmpl/unido/en/catalogue/subject.tmpl
 delete mode 100644 koha-tmpl/intranet-tmpl/unido/en/circ/returns.tmpl
 delete mode 100644 koha-tmpl/intranet-tmpl/unido/en/images/intranet-logo.gif
 delete mode 100644 koha-tmpl/intranet-tmpl/unido/en/images/unido-intranet-photos.jpg
 delete mode 100644 koha-tmpl/intranet-tmpl/unido/en/includes/2-column-end.inc
 delete mode 100644 koha-tmpl/intranet-tmpl/unido/en/includes/3-column-end.inc
 delete mode 100644 koha-tmpl/intranet-tmpl/unido/en/includes/3-column-seperator.inc
 delete mode 100644 koha-tmpl/intranet-tmpl/unido/en/includes/acquisitions-bottom.inc
 delete mode 100644 koha-tmpl/intranet-tmpl/unido/en/includes/acquisitions-top.inc
 delete mode 100644 koha-tmpl/intranet-tmpl/unido/en/includes/cat-bottom.inc
 delete mode 100644 koha-tmpl/intranet-tmpl/unido/en/includes/cat-top.inc
 delete mode 100644 koha-tmpl/intranet-tmpl/unido/en/includes/general-end.inc
 delete mode 100644 koha-tmpl/intranet-tmpl/unido/en/includes/general-first-column-divider.inc
 delete mode 100644 koha-tmpl/intranet-tmpl/unido/en/includes/general-top.inc
 delete mode 100644 koha-tmpl/intranet-tmpl/unido/en/includes/home-modern.css
 delete mode 100644 koha-tmpl/intranet-tmpl/unido/en/includes/login.inc
 delete mode 100644 koha-tmpl/intranet-tmpl/unido/en/includes/main.css
 delete mode 100644 koha-tmpl/intranet-tmpl/unido/en/includes/members-bottom.inc
 delete mode 100644 koha-tmpl/intranet-tmpl/unido/en/includes/members-top.inc
 delete mode 100644 koha-tmpl/intranet-tmpl/unido/en/intranet-main.tmpl
 delete mode 100644 koha-tmpl/intranet-tmpl/unido/en/members/memberentry.tmpl
 delete mode 100644 koha-tmpl/intranet-tmpl/unido/en/members/members-home.tmpl
 delete mode 100644 koha-tmpl/intranet-tmpl/unido/en/members/moremember.tmpl
 delete mode 100644 koha-tmpl/intranet-tmpl/unido/en/modbib.tmpl
 delete mode 100644 koha-tmpl/intranet-tmpl/unido/en/modbibitem.tmpl
 delete mode 100644 koha-tmpl/intranet-tmpl/unido/en/newmember.tmpl
 create mode 100644 koha-tmpl/opac-tmpl/css/en/includes/popup-bottom.inc
 create mode 100644 koha-tmpl/opac-tmpl/css/en/includes/popup-top.inc
 delete mode 100644 koha-tmpl/opac-tmpl/unido/en/about.tmpl
 delete mode 100644 koha-tmpl/opac-tmpl/unido/en/contact.tmpl
 delete mode 100644 koha-tmpl/opac-tmpl/unido/en/images/unido-home-photos.jpg
 delete mode 100644 koha-tmpl/opac-tmpl/unido/en/images/unido-logo.gif
 delete mode 100644 koha-tmpl/opac-tmpl/unido/en/includes/crumb-end.inc
 delete mode 100644 koha-tmpl/opac-tmpl/unido/en/includes/crumb-start.inc
 delete mode 100644 koha-tmpl/opac-tmpl/unido/en/includes/home-modern.css
 delete mode 100644 koha-tmpl/opac-tmpl/unido/en/includes/itemtype-image.inc
 delete mode 100644 koha-tmpl/opac-tmpl/unido/en/includes/koha.css
 delete mode 100644 koha-tmpl/opac-tmpl/unido/en/includes/main.css
 delete mode 100644 koha-tmpl/opac-tmpl/unido/en/includes/opac.css
 delete mode 100644 koha-tmpl/opac-tmpl/unido/en/includes/script.js
 delete mode 100644 koha-tmpl/opac-tmpl/unido/en/includes/vanilla-about-menu.inc
 delete mode 100644 koha-tmpl/opac-tmpl/unido/en/includes/vanilla-about-menu.tmpl
 delete mode 100644 koha-tmpl/opac-tmpl/unido/en/includes/vanilla-botnav-all.inc
 delete mode 100644 koha-tmpl/opac-tmpl/unido/en/includes/vanilla-cat-search.inc
 delete mode 100644 koha-tmpl/opac-tmpl/unido/en/includes/vanilla-contact-menu.tmpl
 delete mode 100644 koha-tmpl/opac-tmpl/unido/en/includes/vanilla-crumb-end.inc
 delete mode 100644 koha-tmpl/opac-tmpl/unido/en/includes/vanilla-crumb-start.inc
 delete mode 100644 koha-tmpl/opac-tmpl/unido/en/includes/vanilla-end-main.inc
 delete mode 100644 koha-tmpl/opac-tmpl/unido/en/includes/vanilla-key.inc
 delete mode 100644 koha-tmpl/opac-tmpl/unido/en/includes/vanilla-left-nav.inc
 delete mode 100644 koha-tmpl/opac-tmpl/unido/en/includes/vanilla-logout.inc
 delete mode 100644 koha-tmpl/opac-tmpl/unido/en/includes/vanilla-main.css
 delete mode 100644 koha-tmpl/opac-tmpl/unido/en/includes/vanilla-member-menu.inc
 delete mode 100644 koha-tmpl/opac-tmpl/unido/en/includes/vanilla-membership-botnav.inc
 delete mode 100644 koha-tmpl/opac-tmpl/unido/en/includes/vanilla-membership-left-nav.inc
 delete mode 100644 koha-tmpl/opac-tmpl/unido/en/includes/vanilla-menu.inc
 delete mode 100644 koha-tmpl/opac-tmpl/unido/en/includes/vanilla-personal-details.inc
 delete mode 100644 koha-tmpl/opac-tmpl/unido/en/includes/vanilla-search-menu.inc
 delete mode 100644 koha-tmpl/opac-tmpl/unido/en/opac-detail-all.tmpl
 delete mode 100644 koha-tmpl/opac-tmpl/unido/en/opac-detail-multi.tmpl
 delete mode 100644 koha-tmpl/opac-tmpl/unido/en/opac-detail.tmpl
 delete mode 100644 koha-tmpl/opac-tmpl/unido/en/opac-main.tmpl
 delete mode 100644 koha-tmpl/opac-tmpl/unido/en/opac-search.tmpl
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/images/book.gif
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/images/circle.gif
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/images/disk.gif
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/images/dk-brown-dot.gif
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/images/dvd.gif
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/images/fine.gif
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/images/front-arrow.gif
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/images/front-background-med.gif
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/images/heading-login-2.gif
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/images/heading-login.gif
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/images/heading-member.gif
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/images/heading-search-2.gif
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/images/heading-search-3.gif
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/images/heading-search.gif
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/images/hltlogo.gif
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/images/holder.gif
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/images/jigsaw.gif
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/images/koha.gif
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/images/large-print.gif
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/images/magazine.gif
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/images/map.gif
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/images/picture-book.gif
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/images/place-reserve.jpg
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/images/search-button.gif
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/images/selected-circle.gif
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/images/sm-book.gif
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/images/sm-disk.gif
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/images/sm-dvd.gif
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/images/sm-jigsaw.gif
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/images/sm-lg-print.gif
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/images/sm-picture-book.gif
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/images/sm-tape.gif
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/images/styles/home-go-button.gif
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/images/talking-book.gif
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/images/tan-dot.gif
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/images/tape.gif
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/images/vanilla-logout-button.gif
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/includes/crumb-end.inc
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/includes/crumb-start.inc
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/includes/itemtype-image.inc
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/includes/koha.css
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/includes/main.css
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/includes/opac.css
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/includes/script.js
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/includes/vanilla-botnav-all.inc
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/includes/vanilla-cat-search.inc
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/includes/vanilla-crumb-end.inc
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/includes/vanilla-crumb-start.inc
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/includes/vanilla-end-main.inc
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/includes/vanilla-key.inc
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/includes/vanilla-left-nav.inc
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/includes/vanilla-logout.inc
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/includes/vanilla-main.css
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/includes/vanilla-member-menu.inc
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/includes/vanilla-membership-botnav.inc
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/includes/vanilla-membership-left-nav.inc
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/includes/vanilla-menu.inc
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/includes/vanilla-personal-details.inc
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/includes/vanilla-search-menu.inc
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/loggedin.tmpl
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/opac-account.tmpl
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/opac-auth.tmpl
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/opac-detail.tmpl
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/opac-main.tmpl
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/opac-membership.tmpl
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/opac-readingrecord.tmpl
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/opac-reserve.tmpl
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/opac-search.tmpl
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/opac-searchresults.tmpl
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/opac-user.tmpl
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/opac-userdetails.tmpl
 delete mode 100644 koha-tmpl/opac-tmpl/vanilla/en/opac-userupdate.tmpl
 create mode 100644 misc/info/INSTALL
 create mode 100755 misc/merge_authority.pl
 create mode 100644 misc/migration_tools/build6xx.pl
 create mode 100755 misc/migration_tools/buildEDITORS.pl
 create mode 100755 misc/migration_tools/check_marc_definition.pl
 create mode 100644 misc/release notes/release_notes_221.txt
 create mode 100644 misc/translator/po/css_opac_it_IT.po
 create mode 100755 misc/translator/po/stats.pl
 create mode 100755 misc/translator/po/update.pl

diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm
index e158eeede8..2fd80043fd 100644
--- a/C4/Acquisition.pm
+++ b/C4/Acquisition.pm
@@ -599,7 +599,7 @@ sub ordersearch {
 sub histsearch {
 	my ($title,$author,$name)=@_;
 	my $dbh= C4::Context->dbh;
-	my $query = "select biblio.title,aqorders.basketno,name,aqbasket.creationdate,aqorders.datereceived, aqorders.quantity
+	my $query = "select biblio.title,aqorders.basketno,name,aqbasket.creationdate,aqorders.datereceived, aqorders.quantity, aqorders.ecost
 							from aqorders,aqbasket,aqbooksellers,biblio 
 							where aqorders.basketno=aqbasket.basketno and aqbasket.booksellerid=aqbooksellers.id and
 							biblio.biblionumber=aqorders.biblionumber";
diff --git a/C4/AuthoritiesMarc.pm b/C4/AuthoritiesMarc.pm
index 1e538e268f..fd1a20f4b6 100644
--- a/C4/AuthoritiesMarc.pm
+++ b/C4/AuthoritiesMarc.pm
@@ -61,7 +61,24 @@ sub authoritysearch {
 	#		where m1.authid=m2.authid and
 	#		(m1.subfieldvalue like "Des%" and m2.subfieldvalue like "27%")
 
+	# the marclist may contain "mainentry". In this case, search the tag_to_report, that depends on
+	# the authtypecode. Then, search on $a of this tag_to_report
+	for (my $i=0;$i<$#{$tags};$i++) {
+		if (@$tags[$i] eq "mainentry") {
+			my $sth = $dbh->prepare("select auth_tag_to_report from auth_types where authtypecode=?");
+			$sth->execute($authtypecode);
+			my ($tag_to_report) = $sth->fetchrow;
+			@$tags[$i] = $tag_to_report."a";
+		}
+	}
+
 	# "Normal" statements
+	# quote marc fields/subfields
+	for (my $i=0;$i<$#{$tags};$i++) {
+		if (@$tags[$i]) {
+			@$tags[$i] = $dbh->quote(@$tags[$i]);
+		}
+	}
 	my @normal_tags = ();
 	my @normal_and_or = ();
 	my @normal_operator = ();
@@ -511,7 +528,11 @@ sub AUTHmodauthority {
 # 2nd recreate it
 	&AUTHdelauthority($dbh,$authid,1);
 	&AUTHaddauthority($dbh,$record,$authid,AUTHfind_authtypecode($dbh,$authid));
-	# FIXME : modify the authority in biblio too.
+	# save the file in localfile/modified_authorities
+	my $filename = C4::Context->config("intranetdir")."/localfile/modified_authorities/$authid.authid";
+	open AUTH, "> $filename";
+	print AUTH $authid;
+	close AUTH;
 }
 
 sub AUTHdelauthority {
@@ -837,6 +858,19 @@ Paul POULAIN paul.poulain@free.fr
 
 # $Id$
 # $Log$
+# Revision 1.10  2005/03/01 13:40:48  tipaul
+# merging 2.2 branch with head. Sorry for not making it before, many many commits done here
+#
+# Revision 1.9.2.2  2005/02/28 14:03:13  tipaul
+# * adding search on "main entry" (ie $a subfield) on a given authority (the "search everywhere" field is still here).
+# * adding a select box to requet "contain" or "begin with" search.
+# * fixing some bug in authority search (related to "main entry" search)
+#
+# Revision 1.9.2.1  2005/02/24 13:12:13  tipaul
+# saving authority modif in a text file. This will be used soon with another script (in crontab). The script in crontab will retrieve every authorityid in the directory localfile/authorities and modify every biblio using this authority. Those modifs may be long. So they can't be done through http, because we may encounter a webserver timeout, and kill the process before end of the job.
+# So, it will be done through a cron job.
+# (/me agree we need some doc for command line scripts)
+#
 # Revision 1.9  2004/12/23 09:48:11  tipaul
 # Minor changes in summary "exploding" (the 3 digits AFTER the subfield were not on the right place).
 #
diff --git a/C4/Biblio.pm b/C4/Biblio.pm
index ae27005780..125fdd78a2 100644
--- a/C4/Biblio.pm
+++ b/C4/Biblio.pm
@@ -66,6 +66,7 @@ $VERSION = 0.01;
   &MARCkoha2marcItem &MARChtml2marc
   &MARCgetbiblio &MARCgetitem
   &MARCaddword &MARCdelword
+  &MARCdelsubfield
   &char_decode
   
   &FindDuplicate
@@ -201,6 +202,7 @@ MARCfindsubfieldid find a subfieldid for a bibid/tag/tagorder/subfield/subfieldo
 =item &MARCdelsubfield($dbh,$bibid,$tag,$tagorder,$subfield,$subfieldorder);
 
 MARCdelsubfield delete a subfield for a bibid/tag/tagorder/subfield/subfieldorder
+If $subfieldorder is not set, delete all the $tag$subfield subfields 
 
 =item &MARCdelbiblio($dbh,$bibid);
 
@@ -878,11 +880,26 @@ sub MARCdelsubfield {
 
     # delete a subfield for $bibid / tag / tagorder / subfield / subfieldorder
     my ( $dbh, $bibid, $tag, $tagorder, $subfield, $subfieldorder ) = @_;
-    $dbh->do( "delete from marc_subfield_table where bibid='$bibid' and
-			tag='$tag' and tagorder='$tagorder'
-			and subfieldcode='$subfield' and subfieldorder='$subfieldorder'
-			"
-    );
+	if ($subfieldorder) {
+		$dbh->do( "delete from marc_subfield_table where bibid='$bibid' and
+				tag='$tag' and tagorder='$tagorder'
+				and subfieldcode='$subfield' and subfieldorder='$subfieldorder'
+				"
+		);
+		$dbh->do( "delete from marc_word where bibid='$bibid' and
+				tagsubfield='$tag$subfield' and tagorder='$tagorder'
+				and subfieldorder='$subfieldorder'
+				"
+		);
+	} else {
+		$dbh->do( "delete from marc_subfield_table where bibid='$bibid' and
+				tag='$tag' and tagorder='$tagorder'
+				and subfieldcode='$subfield'"
+		);
+		$dbh->do( "delete from marc_word where bibid='$bibid' and
+				tagsubfield='$tag$subfield' and tagorder='$tagorder'"
+		);
+	}
 }
 
 sub MARCkoha2marcBiblio {
@@ -956,7 +973,7 @@ sub MARCkoha2marcBiblio {
         " SELECT subtitle FROM bibliosubtitle WHERE biblionumber=?");
     $sth2->execute($biblionumber);
     while ( my $row = $sth2->fetchrow_hashref ) {
-        &MARCkoha2marcOnefield( $sth, $record, "bibliosubtitle.title",
+        &MARCkoha2marcOnefield( $sth, $record, "bibliosubtitle.subtitle",
             $row->{'subtitle'},'' );
     }
     return $record;
@@ -1136,13 +1153,18 @@ sub MARCmarc2kohaOneField {
     my $subfield;
     ( $tagfield, $subfield ) = MARCfind_marc_from_kohafield("",$kohatable.".".$kohafield,$frameworkcode);
     foreach my $field ( $record->field($tagfield) ) {
-        if ( $field->subfield($subfield) ) {
-            if ( $result->{$kohafield} ) {
-                $result->{$kohafield} .= " | " . $field->subfield($subfield);
-            }
-            else {
-                $result->{$kohafield} = $field->subfield($subfield);
-            }
+        if ( $field->subfields ) {
+            my @subfields = $field->subfields();
+            foreach my $subfieldcount ( 0 .. $#subfields ) {
+				if ($subfields[$subfieldcount][0] eq $subfield) {
+					if ( $result->{$kohafield} ) {
+						$result->{$kohafield} .= " | " . $subfields[$subfieldcount][1];
+					}
+					else {
+						$result->{$kohafield} = $subfields[$subfieldcount][1];
+					}
+				}
+			}
         }
     }
 # 	warn "OneField for $kohatable.$kohafield and $frameworkcode=> $tagfield, $subfield";
@@ -1229,7 +1251,7 @@ sub NEWnewbiblio {
         }
     }
     ( $tagfield, $tagsubfield ) =
-      MARCfind_marc_from_kohafield( $dbh, "bibliosubtitle.title",$frameworkcode );
+      MARCfind_marc_from_kohafield( $dbh, "bibliosubtitle.subtitle",$frameworkcode );
     my @subtitlefields = $record->field($tagfield);
     foreach my $subtitlefield (@subtitlefields) {
         my @subtitlesubfields = $subtitlefield->subfield($tagsubfield);
@@ -1304,8 +1326,13 @@ sub NEWmodbiblio {
 	my @subtitlefields = $record->field($tagfield);
 	foreach my $subtitlefield (@subtitlefields) {
 		my @subtitlesubfields = $subtitlefield->subfield($tagsubfield);
+		# delete & create subtitle again because OLDmodsubtitle can't handle new subtitles
+		# between 2 modifs
+		$dbh->do("delete from bibliosubtitle where biblionumber=$oldbiblionumber");
 		foreach my $subfieldcount (0..$#subtitlesubfields) {
-			OLDmodsubtitle($dbh,$oldbiblionumber,$subtitlesubfields[$subfieldcount]);
+			foreach my $subtit(split /\||#/,$subtitlesubfields[$subfieldcount]) {
+				OLDnewsubtitle($dbh,$oldbiblionumber,$subtit);
+			}
 		}
 	}
 	($tagfield,$tagsubfield) = MARCfind_marc_from_kohafield($dbh,"bibliosubject.subject",$frameworkcode);
@@ -1601,13 +1628,12 @@ sub OLDmodsubject {
 
 sub OLDmodbibitem {
     my ( $dbh, $biblioitem ) = @_;
-
-    #    my $dbh   = C4Connect;
     my $query;
 
     $biblioitem->{'itemtype'}      = $dbh->quote( $biblioitem->{'itemtype'} );
     $biblioitem->{'url'}           = $dbh->quote( $biblioitem->{'url'} );
     $biblioitem->{'isbn'}          = $dbh->quote( $biblioitem->{'isbn'} );
+    $biblioitem->{'issn'}          = $dbh->quote( $biblioitem->{'issn'} );
     $biblioitem->{'publishercode'} =
       $dbh->quote( $biblioitem->{'publishercode'} );
     $biblioitem->{'publicationyear'} =
@@ -1627,6 +1653,7 @@ sub OLDmodbibitem {
 itemtype        = $biblioitem->{'itemtype'},
 url             = $biblioitem->{'url'},
 isbn            = $biblioitem->{'isbn'},
+issn            = $biblioitem->{'issn'},
 publishercode   = $biblioitem->{'publishercode'},
 publicationyear = $biblioitem->{'publicationyear'},
 classification  = $biblioitem->{'classification'},
@@ -1644,8 +1671,6 @@ where biblioitemnumber = $biblioitem->{'biblioitemnumber'}";
     if ( $dbh->errstr ) {
         warn "$query";
     }
-
-    #    $dbh->disconnect;
 }    # sub modbibitem
 
 sub OLDmodnote {
@@ -1720,7 +1745,7 @@ sub OLDnewsubtitle {
     my $sth =
       $dbh->prepare(
         "insert into bibliosubtitle set biblionumber = ?, subtitle = ?");
-    $sth->execute( $bibnum, $subtitle );
+    $sth->execute( $bibnum, $subtitle ) if $subtitle;
     $sth->finish;
 }
 
@@ -1807,11 +1832,6 @@ sub OLDmoditem {
         $item->{'itemcallnumber'}, $item->{'notforloan'},
         $item->{'location'},	   $item->{'itemnum'}
     );
-    if ( $item->{'barcode'} eq '' ) {
-        $item->{'notforloan'} = 0 unless $item->{'notforloan'};
-        $query = "update items set notforloan=? where itemnumber=?";
-        @bind = ( $item->{'notforloan'}, $item->{'itemnum'} );
-    }
     if ( $item->{'lost'} ne '' ) {
         $query = "update items set biblioitemnumber=?,
                              barcode=?,
@@ -2633,6 +2653,25 @@ Paul POULAIN paul.poulain@free.fr
 
 # $Id$
 # $Log$
+# Revision 1.116  2005/03/01 13:40:48  tipaul
+# merging 2.2 branch with head. Sorry for not making it before, many many commits done here
+#
+# Revision 1.115.2.5  2005/02/24 13:54:04  tipaul
+# exporting MARCdelsubfield sub. It's used in authority merging.
+# Modifying it too to enable deletion of all subfields from a given tag/subfield or just one.
+#
+# Revision 1.115.2.4  2005/02/17 12:44:25  tipaul
+# bug in acquisition : the title was also stored as subtitle.
+#
+# Revision 1.115.2.3  2005/02/10 13:14:36  tipaul
+# * multiple main authors are now correctly handled in simple (non-MARC) view
+#
+# Revision 1.115.2.2  2005/01/11 16:02:35  tipaul
+# in catalogue, modifs were not stored properly the non-MARC item DB. Affect only libraries without barcodes.
+#
+# Revision 1.115.2.1  2005/01/11 14:45:37  tipaul
+# bugfix : issn were not stored correctly in non-MARC DB on biblio modification
+#
 # Revision 1.115  2005/01/06 14:32:17  tipaul
 # improvement of speed for bulkmarcimport.
 # A sub had been forgotten to use the C4::Context->marcfromkohafield array, that caches DB datas.
diff --git a/C4/Bull.pm b/C4/Bull.pm
index 3c2ae0d775..3b1a5556e3 100755
--- a/C4/Bull.pm
+++ b/C4/Bull.pm
@@ -44,7 +44,8 @@ Give all XYZ functions
 =cut
 
 @ISA = qw(Exporter);
-@EXPORT = qw(&newsubscription &modsubscription &getsubscriptions &getsubscription &getsubscriptionfrombiblionumber
+@EXPORT = qw(&newsubscription &modsubscription &delsubscription &getsubscriptions &getsubscription 
+			&getsubscriptionfrombiblionumber &get_subscription_list_from_biblionumber
 			&modsubscriptionhistory
 			&getserials &serialchangestatus
 			&Find_Next_Date, &Get_Next_Seq
@@ -136,16 +137,6 @@ sub newsubscription {
 	my $serialseq = Get_Seq($val);
 	$sth = $dbh->prepare("insert into serial (serialseq,subscriptionid,biblionumber,status, planneddate) values (?,?,?,?,?)");
 	$sth->execute($serialseq, $subscriptionid, $val->{'biblionumber'}, 1, format_date_in_iso($startdate));
-
-	# next issue number
-	#my ($newserialseq,$newlastvalue1,$newlastvalue2,$newlastvalue3,$newinnerloop1,$newinnerloop2,$newinnerloop3) = Get_Next_Seq($val);
-	# next date (calculated from actual date & frequency parameters)
-	#my $nextplanneddate = Get_Next_Date($startdate,$val);
-# 	$sth = $dbh->prepare("update subscription set lastvalue1=?, lastvalue2=?,lastvalue3=?,
-# 													innerloop1=?,innerloop2=?,innerloop3=?
-# 													where subscriptionid = ?");
-# 	$sth->execute($newlastvalue1,$newlastvalue2,$newlastvalue3,$newinnerloop1,$newinnerloop2,$newinnerloop3,$subscriptionid);
-# 	$sth->finish;  
 	return $subscriptionid;
 }
 sub getsubscription {
@@ -166,12 +157,32 @@ sub getsubscription {
 sub getsubscriptionfrombiblionumber {
 	my ($biblionumber) = @_;
 	my $dbh = C4::Context->dbh;
-	my $sth = $dbh->prepare('select subscriptionid from subscription where biblionumber=?');
+	my $sth = $dbh->prepare('select count(*) from subscription where biblionumber=?');
 	$sth->execute($biblionumber);
-	my $subscriptionid = $sth->fetchrow;
-	return $subscriptionid;
+	my $subscriptionsnumber = $sth->fetchrow;
+	return $subscriptionsnumber;
 }
 
+sub get_subscription_list_from_biblionumber {
+	my ($biblionumber) = @_;
+	my $dbh = C4::Context->dbh;
+	my $sth = $dbh->prepare('select subscription.*,subscriptionhistory.*,aqbudget.bookfundid,aqbooksellers.name as aqbooksellername,biblio.title as bibliotitle 
+							from subscription 
+							left join subscriptionhistory on subscription.subscriptionid=subscriptionhistory.subscriptionid
+							left join aqbudget on subscription.aqbudgetid=aqbudget.aqbudgetid 
+							left join aqbooksellers on subscription.aqbooksellerid=aqbooksellers.id 
+							left join biblio on biblio.biblionumber=subscription.biblionumber 
+							where subscription.biblionumber = ?');
+	$sth->execute($biblionumber);
+	my @res;
+	while (my $subs = $sth->fetchrow_hashref) {
+		$subs->{'startdate'} = format_date($subs->{'startdate'});
+		push @res,$subs;
+	}
+	return \@res;
+}
+
+
 sub modsubscription {
 	my ($auser,$aqbooksellerid,$cost,$aqbudgetid,$startdate,
 					$periodicity,$dow,$numberlength,$weeklength,$monthlength,
@@ -196,14 +207,31 @@ sub modsubscription {
 
 }
 
+sub delsubscription {
+	my ($subscriptionid) = @_;
+	# check again there is only one issue (the subscription is new)
+	my ($totalissues) = getserials($subscriptionid);
+	if ($totalissues eq 1) {
+		my $dbh = C4::Context->dbh;
+		$subscriptionid=$dbh->quote($subscriptionid);
+		$dbh->do("delete from subscription where subscriptionid=$subscriptionid");
+		$dbh->do("delete from subscriptionhistory where subscriptionid=$subscriptionid");
+		$dbh->do("delete from serial where subscriptionid=$subscriptionid");
+	}
+}
 sub getsubscriptions {
-	my ($title,$ISSN) = @_;
-	return unless $title or $ISSN;
+	my ($title,$ISSN,$biblionumber) = @_;
+	return unless $title or $ISSN or $biblionumber;
 	my $dbh = C4::Context->dbh;
 	my $sth;
-	$sth = $dbh->prepare("select subscription.subscriptionid,biblio.title,biblioitems.issn from subscription,biblio,biblioitems where  biblio.biblionumber = biblioitems.biblionumber and biblio.biblionumber=subscription.biblionumber and (biblio.title like ? or biblioitems.issn = ? )");
-	$sth->execute("%$title%",$ISSN);
-	my @results;
+	if ($biblionumber) {
+		$sth = $dbh->prepare("select subscription.subscriptionid,biblio.title,biblioitems.issn,subscription.notes from subscription,biblio,biblioitems where  biblio.biblionumber = biblioitems.biblionumber and biblio.biblionumber=subscription.biblionumber and biblio.biblionumber=?");
+		$sth->execute($biblionumber);
+	} else {
+		$sth = $dbh->prepare("select subscription.subscriptionid,biblio.title,biblioitems.issn,subscription.notes from subscription,biblio,biblioitems where  biblio.biblionumber = biblioitems.biblionumber and biblio.biblionumber=subscription.biblionumber and (biblio.title like ? or biblioitems.issn = ? )");
+		$sth->execute("%$title%",$ISSN);
+	}
+		my @results;
 	while (my $line = $sth->fetchrow_hashref) {
 		push @results, $line;
 	}
@@ -216,7 +244,9 @@ sub modsubscriptionhistory {
 	my $sth = $dbh->prepare("update subscriptionhistory set histstartdate=?,enddate=?,recievedlist=?,missinglist=?,opacnote=?,librariannote=? where subscriptionid=?");
 	$sth->execute($histstartdate,$enddate,$recievedlist,$missinglist,$opacnote,$librariannote,$subscriptionid);
 }
-# get every serial not arrived for a given subscription.
+# get every serial not arrived for a given subscription
+# as well as the number of issues registered in the database (all types)
+# this number is used to see if a subscription can be deleted (=it must have only 1 issue)
 sub getserials {
 	my ($subscriptionid) = @_;
 	my $dbh = C4::Context->dbh;
@@ -229,7 +259,10 @@ sub getserials {
 		$line->{"planneddate"} = format_date($line->{"planneddate"});
 		push @serials,$line;
 	}
-	return @serials;
+	$sth=$dbh->prepare("select count(*) from serial where subscriptionid=?");
+	$sth->execute($subscriptionid);
+	my ($totalissues) = $sth->fetchrow;
+	return ($totalissues,@serials);
 }
 
 sub serialchangestatus {
diff --git a/C4/Circulation/Circ2.pm b/C4/Circulation/Circ2.pm
index 72facceead..d0adf9cf10 100755
--- a/C4/Circulation/Circ2.pm
+++ b/C4/Circulation/Circ2.pm
@@ -721,7 +721,7 @@ sub canbookbeissued {
 	unless ($iteminformation->{barcode}) {
 		$issuingimpossible{UNKNOWN_BARCODE} = 1;
 	}
-	if ($iteminformation->{'notforloan'} == 1) {
+	if ($iteminformation->{'notforloan'} > 0) {
 		$issuingimpossible{NOT_FOR_LOAN} = 1;
 	}
 	if ($iteminformation->{'itemtype'} eq 'REF') {
diff --git a/C4/Context.pm b/C4/Context.pm
index 2d72ae8d51..78c817fbed 100644
--- a/C4/Context.pm
+++ b/C4/Context.pm
@@ -226,6 +226,7 @@ sub new
 
 	# Load the desired config file.
 	$self->{"config"} = &read_config_file($conf_fname);
+	warn "read_config_file($conf_fname) returned undef" if !defined($self->{"config"});
 	return undef if !defined($self->{"config"});
 
 	$self->{"dbh"} = undef;		# Database handle
diff --git a/C4/Search.pm b/C4/Search.pm
index 8d305a8f6b..1f1d4b2db8 100755
--- a/C4/Search.pm
+++ b/C4/Search.pm
@@ -1317,9 +1317,11 @@ sub ItemInfo {
 	my @results;
 	while (my $data=$sth->fetchrow_hashref){
 		my $datedue = '';
-		my $isth=$dbh->prepare("Select * from issues where itemnumber = ? and returndate is null");
+		my $isth=$dbh->prepare("Select issues.*,borrowers.cardnumber from issues,borrowers where itemnumber = ? and returndate is null and issues.borrowernumber=borrowers.borrowernumber");
 		$isth->execute($data->{'itemnumber'});
 		if (my $idata=$isth->fetchrow_hashref){
+		$data->{borrowernumber} = $idata->{borrowernumber};
+		$data->{cardnumber} = $idata->{cardnumber};
 		$datedue = format_date($idata->{'date_due'});
 		}
 		if ($data->{'itemlost'} eq '2'){
@@ -1345,13 +1347,19 @@ sub ItemInfo {
 		if (my $bdata=$bsth->fetchrow_hashref){
 			$data->{'branchname'} = $bdata->{'branchname'};
 		}
-	#   $results[$i]="$data->{'title'}\t$data->{'barcode'}\t$datedue\t$data->{'branchname'}\t$data->{'dewey'}";
-		# FIXME - If $data->{'datelastseen'} is NULL, perhaps it'd be prettier
-		# to leave it empty, rather than convert it to "//".
-		# Also ideally this should use the local format for displaying dates.
 		my $date=format_date($data->{'datelastseen'});
 		$data->{'datelastseen'}=$date;
 		$data->{'datedue'}=$datedue;
+	# get notforloan complete status if applicable
+		my $sthnflstatus = $dbh->prepare('select authorised_value from marc_subfield_structure where kohafield="items.notforloan"');
+		$sthnflstatus->execute;
+		my ($authorised_valuecode) = $sthnflstatus->fetchrow;
+		if ($authorised_valuecode) {
+			$sthnflstatus = $dbh->prepare("select lib from authorised_values where category=? and authorised_value=?");
+			$sthnflstatus->execute($authorised_valuecode,$data->{itemnotforloan});
+			my ($lib) = $sthnflstatus->fetchrow;
+			$data->{notforloan} = $lib;
+		}
 		$results[$i]=$data;
 		$i++;
 	}
@@ -1480,12 +1488,24 @@ sub bibdata {
 								from biblio, biblioitems
 								left join bibliosubtitle on
 								biblio.biblionumber = bibliosubtitle.biblionumber
+								left join itemtypes on biblioitems.itemtype=itemtypes.itemtype
 								where biblio.biblionumber = ?
 								and biblioitems.biblionumber = biblio.biblionumber");
 	$sth->execute($bibnum);
 	my $data;
 	$data  = $sth->fetchrow_hashref;
 	$sth->finish;
+	# handle management of repeated subtitle
+	$sth   = $dbh->prepare("Select * from bibliosubtitle where biblionumber = ?");
+	$sth->execute($bibnum);
+	my @subtitles;
+	while (my $dat = $sth->fetchrow_hashref){
+		my %line;
+		$line{subtitle} = $dat->{subtitle};
+		push @subtitles, \%line;
+	} # while
+	$data->{subtitles} = \@subtitles;
+	$sth->finish;
 	$sth   = $dbh->prepare("Select * from bibliosubject where biblionumber = ?");
 	$sth->execute($bibnum);
 	my @subjects;
@@ -1781,14 +1801,14 @@ C<$count> is the number of elements in C<$borrowers>.
 #used by member enquiries from the intranet
 #called by member.pl
 sub BornameSearch  {
-	my ($env,$searchstring,$type)=@_;
+	my ($env,$searchstring,$orderby,$type)=@_;
 	my $dbh = C4::Context->dbh;
 	my $query = ""; my $count; my @data;
 	my @bind=();
 
 	if($type eq "simple")	# simple search for one letter only
 	{
-		$query="Select * from borrowers where surname like ? order by surname,firstname";
+		$query="Select * from borrowers where surname like ? order by $orderby";
 		@bind=("$searchstring%");
 	}
 	else	# advanced search looking in surname, firstname and othernames
@@ -1809,13 +1829,14 @@ sub BornameSearch  {
 		        push(@bind,"$data[$i]%","% $data[$i]%","$data[$i]%","% $data[$i]%","$data[$i]%","% $data[$i]%");
 					# FIXME - .= <<EOT;
 		}
-		$query=$query.") or cardnumber = ?
-		order by surname,firstname";
+		$query=$query.") or cardnumber like ?
+		order by $orderby";
 		push(@bind,$searchstring);
 					# FIXME - .= <<EOT;
 	}
 
 	my $sth=$dbh->prepare($query);
+	warn "Q $orderby : $query";
 	$sth->execute(@bind);
 	my @results;
 	my $cnt=$sth->rows;
diff --git a/C4/SearchMarc.pm b/C4/SearchMarc.pm
index 18ea6b343f..a42fb0e3c5 100644
--- a/C4/SearchMarc.pm
+++ b/C4/SearchMarc.pm
@@ -166,7 +166,6 @@ $marcflavour ("MARC21" or "UNIMARC") determines which tags are used for retrievi
 
 sub catalogsearch {
 	my ($dbh, $tags, $and_or, $excluding, $operator, $value, $offset,$length,$orderby) = @_;
-	warn "@$tags[0], @$and_or[0], @$excluding[0], @$operator[0], @$value[0], $offset,$length,$orderby";
 	# build the sql request. She will look like :
 	# select m1.bibid
 	#		from marc_subfield_table as m1, marc_subfield_table as m2
@@ -196,7 +195,21 @@ sub catalogsearch {
 # 		$_=~ s/\'/ /g;
 # 		$_=~ s/\,/ /g;
 # 	}
-	
+
+# the item.notforloan contains an integer. Every value <>0 means "book unavailable for loan".
+# but each library can have it's own table of meaning for each value. Get them
+# 1st search if there is a list of authorised values connected to items.notforloan
+	my $sth = $dbh->prepare('select authorised_value from marc_subfield_structure where kohafield="items.notforloan"');
+	$sth->execute;
+	my %notforloanstatus;
+	my ($authorised_valuecode) = $sth->fetchrow;
+	if ($authorised_valuecode) {
+		$sth = $dbh->prepare("select authorised_value,lib from authorised_values where category=?");
+		$sth->execute($authorised_valuecode);
+		while (my ($authorised_value,$lib) = $sth->fetchrow) {
+			$notforloanstatus{$authorised_value} = $lib?$lib:$authorised_value;
+		}
+	}
 	for(my $i = 0 ; $i <= $#{$value} ; $i++)
 	{
 		# replace * by %
@@ -240,8 +253,6 @@ sub catalogsearch {
 # 					warn "word : $word";
 					$word =~ s/%//g unless length($word)>4;
 					unless (C4::Context->stopwords->{uc($word)} or length($word)==1) {	#it's NOT a stopword => use it. Otherwise, ignore
-						my $tag = substr(@$tags[$i],0,3);
-						my $subf = substr(@$tags[$i],3,1);
 						push @normal_tags, @$tags[$i];
 						push @normal_and_or, "and";	# assumes "foo" and "bar" if "foo bar" is entered
 						push @normal_operator, @$operator[$i];
@@ -273,6 +284,7 @@ sub catalogsearch {
 	}
 	$sth->execute();
 	my @result = ();
+        my $subtitle; # Added by JF for Subtitles
 
 	# Processes the NOT if any and there are results
 	my ($not_sql_tables, $not_sql_where1, $not_sql_where2);
@@ -328,6 +340,7 @@ sub catalogsearch {
 							LEFT JOIN biblioitems on biblio.biblionumber = biblioitems.biblionumber
 							LEFT JOIN itemtypes on itemtypes.itemtype=biblioitems.itemtype
 							WHERE biblio.biblionumber = marc_biblio.biblionumber AND bibid = ?");
+        my $sth_subtitle = $dbh->prepare("SELECT subtitle FROM bibliosubtitle WHERE biblionumber=?"); # Added BY JF for Subtitles
 	my @finalresult = ();
 	my @CNresults=();
 	my $totalitems=0;
@@ -342,6 +355,16 @@ sub catalogsearch {
 		my $continue=1;
 		my $line = $sth->fetchrow_hashref;
 		my $biblionumber=$line->{bn};
+        # Return subtitles first ADDED BY JF
+                $sth_subtitle->execute($biblionumber);
+                my $subtitle_here.= $sth_subtitle->fetchrow." ";
+                chop $subtitle_here;
+                $subtitle = $subtitle_here;
+#               warn "Here's the Biblionumber ".$biblionumber;
+#                warn "and here's the subtitle: ".$subtitle_here;
+
+        # /ADDED BY JF
+
 # 		$continue=0 unless $line->{bn};
 # 		my $lastitemnumber;
 		$sth_itemCN->execute($biblionumber);
@@ -365,6 +388,7 @@ sub catalogsearch {
 			$lineCN{itemcallnumber} = $item->{itemcallnumber};
 			$lineCN{location} = $item->{location};
 			$lineCN{date_due} = format_date($date_due);
+			$lineCN{notforloan} = $notforloanstatus{$item->{notforloan}} if ($item->{notforloan});
 			$notforloan=0 unless ($item->{notforloan} or $item->{wthdrawn} or $item->{itemlost});
 			push @CNresults,\%lineCN;
 			$totalitems++;
@@ -373,10 +397,19 @@ sub catalogsearch {
 		my %newline;
 		%newline = %$line;
 		$newline{totitem} = $totalitems;
+		# if $totalitems == 0, check if it's being ordered.
+		if ($totalitems == 0) {
+			my $sth = $dbh->prepare("select count(*) from aqorders where biblionumber=?");
+			$sth->execute($biblionumber);
+			my ($ordered) = $sth->fetchrow;
+			$newline{onorder} = 1 if $ordered;
+		}
 		$newline{biblionumber} = $biblionumber;
 		$newline{norequests} = 0;
 		$newline{norequests} = 1 if ($line->{notforloan}); # itemtype not issuable
 		$newline{norequests} = 1 if (!$line->{notforloan} && $notforloan); # itemtype issuable but all items not issuable for instance
+                $newline{subtitle} = $subtitle;  # put the subtitle in ADDED BY JF
+
 		my @CNresults2= @CNresults;
 		$newline{CN} = \@CNresults2;
 		$newline{'even'} = 1 if $#finalresult % 2 == 0;
diff --git a/ISBDdetail.pl b/ISBDdetail.pl
index 073ffe20fc..e6b39e1078 100755
--- a/ISBDdetail.pl
+++ b/ISBDdetail.pl
@@ -99,7 +99,7 @@ my $res;
 					my @subf = $field->subfields;
 					for my $i (0..$#subf) {
 						my $subfieldcode = $subf[$i][0];
-						my $subfieldvalue = $subf[$i][1];
+						my $subfieldvalue = get_authorised_value_desc($tag, $subf[$i][0], $subf[$i][1], '', $dbh);;
 						my $tagsubf = $tag.$subfieldcode;
 						$calculated =~ s/\{(.?.?.?)$tagsubf(.*?)\}/$1$subfieldvalue\{$1$tagsubf$2\}$2/g;
 					}
@@ -130,3 +130,28 @@ $template->param(ISBD => $res,
 
 output_html_with_http_headers $query, $cookie, $template->output;
 
+sub get_authorised_value_desc ($$$$$) {
+   my($tag, $subfield, $value, $framework, $dbh) = @_;
+
+   #---- branch
+    if ($tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "branches" ) {
+       return getbranchname($value);
+    }
+
+   #---- itemtypes
+   if ($tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "itemtypes" ) {
+       return ItemType($value);
+    }
+
+   #---- "true" authorized value
+   my $category = $tagslib->{$tag}->{$subfield}->{'authorised_value'};
+
+   if ($category ne "") {
+       my $sth = $dbh->prepare("select lib from authorised_values where category = ? and authorised_value = ?");
+       $sth->execute($category, $value);
+       my $data = $sth->fetchrow_hashref;
+       return $data->{'lib'};
+   } else {
+       return $value; # if nothing is found return the original value
+   }
+}
diff --git a/MARCdetail.pl b/MARCdetail.pl
index f1b1f5d216..37866b0a2b 100755
--- a/MARCdetail.pl
+++ b/MARCdetail.pl
@@ -56,7 +56,7 @@ use C4::Search;
 use MARC::Record;
 use C4::Biblio;
 use C4::Acquisition;
-use C4::Bull; #uses getsubscriptionfrom biblionumber
+use C4::Bull; #uses getsubscriptionsfrombiblionumber
 use HTML::Template;
 
 my $query=new CGI;
@@ -121,7 +121,7 @@ for (my $tabloop = 0; $tabloop<=10;$tabloop++) {
 					if ($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{authtypecode}) {
 						$subfield_data{authority}=$fields[$x_i]->subfield(9);
 					}
-					$subfield_data{marc_value}=$subf[$i][1];
+					$subfield_data{marc_value}=get_authorised_value_desc($fields[$x_i]->tag(), $subf[$i][0], $subf[$i][1], '', $dbh);
 				}
 				$subfield_data{marc_subfield}=$subf[$i][0];
 				$subfield_data{marc_tag}=$fields[$x_i]->tag();
@@ -158,6 +158,7 @@ foreach my $field (@fields) {
 # loop through each subfield
 	for my $i (0..$#subf) {
 		next if ($tagslib->{$field->tag()}->{$subf[$i][0]}->{tab}  ne 10);
+		next if ($tagslib->{$field->tag()}->{$subf[$i][0]}->{hidden});
 		$witness{$subf[$i][0]} = $tagslib->{$field->tag()}->{$subf[$i][0]}->{lib};
 		$this_row{$subf[$i][0]} =$subf[$i][1];
 	}
@@ -189,14 +190,39 @@ foreach my $subfield_code (keys(%witness)) {
 	push(@header_value_loop, \%header_value);
 }
 
-my $subscriptionid = getsubscriptionfrombiblionumber($biblionumber);
+my $subscriptionsnumber = getsubscriptionfrombiblionumber($biblionumber);
 $template->param(item_loop => \@item_value_loop,
 						item_header_loop => \@header_value_loop,
 						biblionumber => $biblionumber,
 						bibid => $bibid,
 						biblionumber => $biblionumber,
-						subscriptionid => $subscriptionid,
+						subscriptionsnumber => $subscriptionsnumber,
 						popup => $popup,
 						);
 output_html_with_http_headers $query, $cookie, $template->output;
 
+sub get_authorised_value_desc ($$$$$) {
+   my($tag, $subfield, $value, $framework, $dbh) = @_;
+
+   #---- branch
+    if ($tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "branches" ) {
+       return getbranchname($value);
+    }
+
+   #---- itemtypes
+   if ($tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "itemtypes" ) {
+       return ItemType($value);
+    }
+
+   #---- "true" authorized value
+   my $category = $tagslib->{$tag}->{$subfield}->{'authorised_value'};
+
+   if ($category ne "") {
+       my $sth = $dbh->prepare("select lib from authorised_values where category = ? and authorised_value = ?");
+       $sth->execute($category, $value);
+       my $data = $sth->fetchrow_hashref;
+       return $data->{'lib'};
+   } else {
+       return $value; # if nothing is found return the original value
+   }
+}
diff --git a/about.pl b/about.pl
index 00b715e0a6..b57e36fa4a 100755
--- a/about.pl
+++ b/about.pl
@@ -24,6 +24,7 @@ my $osVersion = `uname -a`;
 my $perlVersion = $];
 my $mysqlVersion = `mysql -V`;
 my $apacheVersion =  `httpd -v`;
+$apacheVersion =  `httpd2 -v` unless $apacheVersion;
 
 $template->param(
 					kohaVersion => $kohaVersion,
diff --git a/acqui.simple/addbiblio.pl b/acqui.simple/addbiblio.pl
index f736192d63..ebdb6db4a2 100755
--- a/acqui.simple/addbiblio.pl
+++ b/acqui.simple/addbiblio.pl
@@ -176,10 +176,16 @@ sub create_input () {
 		$subfield_data{marc_value}= build_authorized_values_list($tag, $subfield, $value, $dbh,$authorised_values_sth);
 	# it's a thesaurus / authority field
 	} elsif ($tagslib->{$tag}->{$subfield}->{authtypecode}) {
-		$subfield_data{marc_value}="<input type=\"text\" name=\"field_value\" value=\"$value\" size=\"47\" maxlength=\"255\" DISABLE READONLY> <a href=\"javascript:Dopop('../authorities/auth_finder.pl?category=".$tagslib->{$tag}->{$subfield}->{authtypecode}."&index=$i',$i)\">...</a>";
+		$subfield_data{marc_value}="<input type=\"text\" name=\"field_value\" value=\"$value\" size=\"47\" maxlength=\"255\" DISABLE READONLY> <a href=\"javascript:Dopop('../authorities/auth_finder.pl?authtypecode=".$tagslib->{$tag}->{$subfield}->{authtypecode}."&index=$i',$i)\">...</a>";
 	# it's a plugin field
 	} elsif ($tagslib->{$tag}->{$subfield}->{'value_builder'}) {
-		my $plugin="../value_builder/".$tagslib->{$tag}->{$subfield}->{'value_builder'};
+		# opening plugin. Just check wether we are on a developper computer on a production one
+		# (the cgidir differs)
+		my $cgidir = C4::Context->intranetdir ."/cgi-bin/value_builder";
+		unless (opendir(DIR, "$cgidir")) {
+			$cgidir = C4::Context->intranetdir."/value_builder";
+		} 
+		my $plugin=$cgidir."/".$tagslib->{$tag}->{$subfield}->{'value_builder'}; 
 		require $plugin;
 		my $extended_param = plugin_parameters($dbh,$rec,$tagslib,$i,$tabloop);
 		my ($function_name,$javascript) = plugin_javascript($dbh,$rec,$tagslib,$i,$tabloop);
diff --git a/acqui/addorder.pl b/acqui/addorder.pl
index 896e669355..ef8cbee0fb 100755
--- a/acqui/addorder.pl
+++ b/acqui/addorder.pl
@@ -97,9 +97,6 @@ if ($quantity ne '0'){
 								isbn        => $isbn?$isbn:"",
 								publishercode => $publishercode?$publishercode:"",
 								});
-			if ($title) {
-				newsubtitle($bibnum,$title);
-			}
 		# change suggestion status if applicable
 		if ($suggestionid) {
 			changestatus($suggestionid,'ORDERED');
diff --git a/admin/auth_subfields_structure.pl b/admin/auth_subfields_structure.pl
index 9b639d5a84..a172c25dd3 100755
--- a/admin/auth_subfields_structure.pl
+++ b/admin/auth_subfields_structure.pl
@@ -199,7 +199,7 @@ if ($op eq 'add_form') {
 	for (my $i=0; $i<= $#tagsubfield ; $i++) {
 		my $tagfield			=$input->param('tagfield');
 		my $tagsubfield		=$tagsubfield[$i];
-		$tagsubfield="@" unless $tagsubfield;
+		$tagsubfield="@" unless $tagsubfield ne '';
 		my $liblibrarian		=$liblibrarian[$i];
 		my $libopac			=$libopac[$i];
 		my $repeatable		=$input->param("repeatable$i")?1:0;
diff --git a/admin/auth_tag_structure.pl b/admin/auth_tag_structure.pl
index 2e8f580ecd..5f362c736f 100755
--- a/admin/auth_tag_structure.pl
+++ b/admin/auth_tag_structure.pl
@@ -173,14 +173,15 @@ if ($op eq 'add_form') {
 	$sth->finish;
 	$template->param(liblibrarian => $data->{'liblibrarian'},
 							searchfield => $searchfield,
+							authtypecode => $authtypecode,
 							);
 													# END $OP eq DELETE_CONFIRM
 ################## DELETE_CONFIRMED ##################################
 # called by delete_confirm, used to effectively confirm deletion of data in DB
 } elsif ($op eq 'delete_confirmed') {
 	unless (C4::Context->config('demo') eq 1) {
-		$dbh->do("delete from auth_tag_structure where tagfield='$searchfield'");
-		$dbh->do("delete from auth_subfield_structure where tagfield='$searchfield'");
+		$dbh->do("delete from auth_tag_structure where tagfield='$searchfield' and authtypecode='$authtypecode'");
+		$dbh->do("delete from auth_subfield_structure where tagfield='$searchfield' and authtypecode='$authtypecode'");
 	}
 													# END $OP eq DELETE_CONFIRMED
 ################## ITEMTYPE_CREATE ##################################
diff --git a/admin/marc_subfields_structure.pl b/admin/marc_subfields_structure.pl
index 7cfde5cad4..e7f3644beb 100755
--- a/admin/marc_subfields_structure.pl
+++ b/admin/marc_subfields_structure.pl
@@ -109,7 +109,7 @@ if ($op eq 'add_form') {
 	# other subfields
 	push @kohafields, "additionalauthors.author";
 	push @kohafields, "bibliosubject.subject";
-	push @kohafields, "bibliosubtitle.title";
+	push @kohafields, "bibliosubtitle.subtitle";
 	# build authorised value list
 	$sth2->finish;
 	$sth2 = $dbh->prepare("select distinct category from authorised_values");
@@ -324,7 +324,7 @@ if ($op eq 'add_form') {
 	for (my $i=0; $i<= $#tagsubfield ; $i++) {
 		my $tagfield			=$input->param('tagfield');
 		my $tagsubfield		=$tagsubfield[$i];
-		$tagsubfield="@" unless $tagsubfield;
+		$tagsubfield="@" unless $tagsubfield ne '';
 		my $liblibrarian		=$liblibrarian[$i];
 		my $libopac			=$libopac[$i];
 		my $repeatable		=$input->param("repeatable$i")?1:0;
@@ -434,7 +434,7 @@ if ($op eq 'add_form') {
 	$template->param(loop => \@loop_data);
 	$template->param(edit_tagfield => $tagfield,
 		edit_frameworkcode => $frameworkcode);
-		
+	
 	if ($offset>0) {
 		my $prevpage = $offset-$pagesize;
 		$template->param(prev =>"<a href=\"$script_name?offset=$prevpage\">");
diff --git a/admin/marctagstructure.pl b/admin/marctagstructure.pl
index 52f4c1620f..027875a915 100755
--- a/admin/marctagstructure.pl
+++ b/admin/marctagstructure.pl
@@ -133,8 +133,8 @@ if ($op eq 'add_form') {
 	}
 	$template->param('use-heading-flags-p' => 1);
 	$template->param(liblibrarian => $data->{'liblibrarian'},
-							libopac => $data->{'libopac'},
-							repeatable => CGI::checkbox(-name=>'repeatable',
+			libopac => $data->{'libopac'},
+			repeatable => CGI::checkbox(-name=>'repeatable',
 						-checked=> $data->{'repeatable'}?'checked':'',
 						-value=> 1,
 						-label => '',
@@ -144,9 +144,9 @@ if ($op eq 'add_form') {
 						-value => 1,
 						-label => '',
 						-id => 'mandatory'),
-							authorised_value => $authorised_value,
-							frameworkcode => $frameworkcode,
-							);
+			authorised_value => $authorised_value,
+			frameworkcode => $frameworkcode,
+			);
 													# END $OP eq ADD_FORM
 ################## ADD_VALIDATE ##################################
 # called by add_form, used to insert/modify data in DB
@@ -218,13 +218,13 @@ if ($op eq 'add_form') {
 	}
 	my $env;
 	my ($count,$results)=StringSearch($env,$searchfield,$frameworkcode);
-	my $toggle="white";
+	my $toggle=0;
 	my @loop_data = ();
 	for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
-	  	if ($toggle eq 'white'){
-			$toggle="#ffffcc";
+	  	if ($toggle eq 0){
+			$toggle=1;
 	  	} else {
-			$toggle="white";
+			$toggle=0;
 	  	}
 		my %row_data;  # get a fresh hash for the row data
 		$row_data{tagfield} = $results->[$i]{'tagfield'};
@@ -232,7 +232,10 @@ if ($op eq 'add_form') {
 		$row_data{repeatable} = $results->[$i]{'repeatable'};
 		$row_data{mandatory} = $results->[$i]{'mandatory'};
 		$row_data{authorised_value} = $results->[$i]{'authorised_value'};
-		$row_data{bgcolor} = $toggle;
+		$row_data{subfield_link} ="marc_subfields_structure.pl?tagfield=".$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode;
+		$row_data{edit} = "$script_name?op=add_form&amp;searchfield=".$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode;
+		$row_data{delete} = "$script_name?op=delete_confirm&amp;searchfield=".$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode;
+		$row_data{toggle} = $toggle;
 		push(@loop_data, \%row_data);
 	}
 	$template->param(loop => \@loop_data);
diff --git a/authorities/auth_finder.pl b/authorities/auth_finder.pl
index 106c6cdc2e..ba8e5d0d84 100755
--- a/authorities/auth_finder.pl
+++ b/authorities/auth_finder.pl
@@ -37,7 +37,7 @@ my $query=new CGI;
 my $op = $query->param('op');
 my $authtypecode = $query->param('authtypecode');
 my $index = $query->param('index');
-my $category = $query->param('category');
+# my $category = $query->param('category');
 my $resultstring = $query->param('result');
 my $dbh = C4::Context->dbh;
 
@@ -68,10 +68,7 @@ if ($op eq "do_search") {
 	$resultsperpage= $query->param('resultsperpage');
 	$resultsperpage = 19 if(!defined $resultsperpage);
 
-	# builds tag and subfield arrays
-	my @tags;
-
-	my ($results,$total) = authoritysearch($dbh, \@tags,\@and_or,
+	my ($results,$total) = authoritysearch($dbh, \@marclist,\@and_or,
 										\@excluding, \@operator, \@value,
 										$startfrom*$resultsperpage, $resultsperpage,$authtypecode);# $orderby);
 
@@ -127,7 +124,7 @@ if ($op eq "do_search") {
 		$to = (($startfrom+1)*$resultsperpage);
 	}
 	$template->param(result => $results) if $results;
-	$template->param(index => $query->param('index'));
+	$template->param(index => $query->param('index')."");
 	$template->param(startfrom=> $startfrom,
 							displaynext=> $displaynext,
 							displayprev=> $displayprev,
@@ -154,12 +151,13 @@ if ($op eq "do_search") {
 				});
 
 	$template->param(index => $index,
-					resultstring => $resultstring
+					resultstring => $resultstring,
 					);
 }
 
-$template->param(authtypesloop => \@authtypesloop);
-$template->param(category => $category);
+$template->param(authtypesloop => \@authtypesloop,
+				authtypecode => $authtypecode);
+warn "CAT : $authtypecode";
 
 # Print the page
 output_html_with_http_headers $query, $cookie, $template->output;
diff --git a/authorities/authorities-home.pl b/authorities/authorities-home.pl
index 3440c93ff2..17a424a1e6 100755
--- a/authorities/authorities-home.pl
+++ b/authorities/authorities-home.pl
@@ -65,7 +65,7 @@ if ($op eq "do_search") {
 	$resultsperpage= $query->param('resultsperpage');
 	$resultsperpage = 19 if(!defined $resultsperpage);
 	my @tags;
-	my ($results,$total) = authoritysearch($dbh, \@tags,\@and_or,
+	my ($results,$total) = authoritysearch($dbh, \@marclist,\@and_or,
 										\@excluding, \@operator, \@value,
 										$startfrom*$resultsperpage, $resultsperpage,$authtypecode);
 	($template, $loggedinuser, $cookie)
diff --git a/bull-home.pl b/bull-home.pl
index 8ee0255cb9..0181a45cea 100755
--- a/bull-home.pl
+++ b/bull-home.pl
@@ -12,7 +12,8 @@ use HTML::Template;
 my $query = new CGI;
 my $title = $query->param('title');
 my $ISSN = $query->param('ISSN');
-my @subscriptions = getsubscriptions($title,$ISSN);
+my $biblionumber = $query->param('biblionumber');
+my @subscriptions = getsubscriptions($title,$ISSN,$biblionumber);
 my ($template, $loggedinuser, $cookie)
 = get_template_and_user({template_name => "bull/bull-home.tmpl",
 				query => $query,
diff --git a/bull/statecollection.pl b/bull/statecollection.pl
index 82dbb9deb0..d82ed2271a 100755
--- a/bull/statecollection.pl
+++ b/bull/statecollection.pl
@@ -39,7 +39,7 @@ if ($op eq 'serialchangestatus') {
 	}
 }
 my $subs = &getsubscription($subscriptionid);
-my @serialslist = getserials($subscriptionid);
+my ($totalissues,@serialslist) = getserials($subscriptionid);
 
 my $sth=$dbh->prepare("select * from subscriptionhistory where subscriptionid = ?");
 $sth->execute($subscriptionid);
diff --git a/bull/subscription-detail.pl b/bull/subscription-detail.pl
index 9732f72b0a..c9bed507e3 100755
--- a/bull/subscription-detail.pl
+++ b/bull/subscription-detail.pl
@@ -69,8 +69,16 @@ if ($op eq 'modsubscription') {
 					$numberingmethod, $status, $biblionumber, $notes, $subscriptionid);
 }
 
+if ($op eq 'del') {
+	&delsubscription($subscriptionid);
+	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=../bull-home.pl\"></html>";
+	exit;
+
+}
 my $subs = &getsubscription($subscriptionid);
-my @serialslist = getserials($subscriptionid);
+my ($totalissues,@serialslist) = getserials($subscriptionid);
+$totalissues-- if $totalissues; # the -1 is to have 0 if this is a new subscription (only 1 issue)
+# the subscription must be deletable if there is NO issues for a reason or another (should not happend, but...)
 
 ($template, $loggedinuser, $cookie)
 = get_template_and_user({template_name => "bull/subscription-detail.tmpl",
@@ -123,6 +131,7 @@ $template->param(
 	notes => $subs->{notes},
 	subscriptionid => $subs->{subscriptionid},
 	serialslist => \@serialslist,
+	totalissues => $totalissues,
 	);
 $template->param(
 			"periodicity$subs->{periodicity}" => 1,
diff --git a/circ/circulation.pl b/circ/circulation.pl
index 58e4254330..d4d6681599 100755
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -104,7 +104,7 @@ my $todaysdate = (1900+$datearr[5]).sprintf ("%0.2d", ($datearr[4]+1)).sprintf (
 #
 my $borrowerslist;
 if ($findborrower) {
-	my ($count,$borrowers)=BornameSearch(\%env,$findborrower,'web');
+	my ($count,$borrowers)=BornameSearch(\%env,$findborrower,'cardnumber','web');
 	my @borrowers=@$borrowers;
 	if ($#borrowers == -1) {
 		$query->param('findborrower', '');
diff --git a/detail.pl b/detail.pl
index b296d9b590..20978161e9 100755
--- a/detail.pl
+++ b/detail.pl
@@ -1,112 +1,76 @@
 #!/usr/bin/perl
-# NOTE: Use standard 8-space tabs for this file (indents are 4 spaces)
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-use HTML::Template;
 use strict;
 require Exporter;
-use C4::Context;
-use C4::Output;  # contains gettemplate
 use CGI;
 use C4::Search;
 use C4::Auth;
+use C4::Bull; #uses getsubscriptionfrom biblionumber
 use C4::Interface::CGI::Output;
-use C4::Date;
+use HTML::Template;
+use C4::Biblio;
+use C4::SearchMarc;
 
 my $query=new CGI;
-my $type=$query->param('type');
-($type) || ($type='intra');
+my ($template, $borrowernumber, $cookie) 
+    = get_template_and_user({template_name => "catalogue/detail.tmpl",
+			     query => $query,
+			     type => "intranet",
+			     authnotrequired => 1,
+			     flagsrequired => {borrow => 1},
+			     });
 
 my $biblionumber=$query->param('bib');
-
-# change back when ive fixed request.pl
-my @items = ItemInfo(undef, $biblionumber, $type);
-my $norequests = 1;
-foreach my $itm (@items) {
-     $norequests = 0 unless $itm->{'notforloan'};
-}
-
+$template->param(biblionumber => $biblionumber);
 
 
-my $dat=bibdata($biblionumber);
-my ($authorcount, $addauthor)= &addauthor($biblionumber);
+# change back when ive fixed request.pl
+my @items                                 = &ItemInfo(undef, $biblionumber, 'intra');
+my $dat                                   = &bibdata($biblionumber);
+my ($authorcount, $addauthor)             = &addauthor($biblionumber);
 my ($webbiblioitemcount, @webbiblioitems) = &getwebbiblioitems($biblionumber);
 my ($websitecount, @websites)             = &getwebsites($biblionumber);
-my ($subjectcount, $subjects) = &subject($biblionumber);
+my $subscriptionsnumber = getsubscriptionfrombiblionumber($biblionumber);
 
 $dat->{'count'}=@items;
-$dat->{'norequests'} = $norequests;
 
 $dat->{'additional'}=$addauthor->[0]->{'author'};
 for (my $i = 1; $i < $authorcount; $i++) {
-	$dat->{'additional'} .= " ; " . $addauthor->[$i]->{'author'};
+        $dat->{'additional'} .= " ; " . $addauthor->[$i]->{'author'};
 } # for
 
-$dat->{'subjects'}=$subjects->[0]->{'subject'};
-for (my $i = 1; $i < $subjectcount; $i++) {
-	$dat->{'subjects'} .= ", " . $subjects->[$i]->{'subject'};
-} # for
+my $norequests = 1;
+foreach my $itm (@items) {
+    $norequests = 0 unless $itm->{'notforloan'};
+    $itm->{$itm->{'publictype'}} = 1;
+}
+
+$template->param(norequests => $norequests);
 
-my @results;
+  ## get notes and subjects from MARC record
+my $marc = C4::Context->preference("marc");
+if ($marc eq "yes") {
+	my $dbh = C4::Context->dbh;
+	my $bibid = &MARCfind_MARCbibid_from_oldbiblionumber($dbh,$biblionumber);
+	my $marcflavour = C4::Context->preference("marcflavour");
+	my $marcnotesarray = &getMARCnotes($dbh,$bibid,$marcflavour);
+	my $marcsubjctsarray = &getMARCsubjects($dbh,$bibid,$marcflavour);
 
-$results[0]=$dat;
+	$template->param(MARCNOTES => $marcnotesarray);
+	$template->param(MARCSUBJCTS => $marcsubjctsarray);
+}
+
+my @results = ($dat,);
 
 my $resultsarray=\@results;
 my $itemsarray=\@items;
 my $webarray=\@webbiblioitems;
 my $sitearray=\@websites;
 
-my $startfrom=$query->param('startfrom');
-($startfrom) || ($startfrom=0);
-
-my ($template, $loggedinuser, $cookie) = get_template_and_user({
-	template_name   => ($type eq 'opac'? 'catalogue/detail-opac.tmpl':
-					     'catalogue/detail.tmpl'),
-	query           => $query,
-	type            => "intranet",
-	authnotrequired => ($type eq 'opac'),
-	flagsrequired   => {catalogue => 1},
-    });
-
-my $count=1;
-
-# now to get the items into a hash we can use and whack that thru
-
-
-my $nextstartfrom=($startfrom+20<$count-20) ? ($startfrom+20) : ($count-20);
-my $prevstartfrom=($startfrom-20>0) ? ($startfrom-20) : (0);
-$template->param(startfrom => $startfrom+1,
-						endat => $startfrom+20,
-						numrecords => $count,
-						nextstartfrom => $nextstartfrom,
-						prevstartfrom => $prevstartfrom,
-						BIBLIO_RESULTS => $resultsarray,
-						ITEM_RESULTS => $itemsarray,
-						WEB_RESULTS => $webarray,
-						SITE_RESULTS => $sitearray,
-						loggedinuser => $loggedinuser,
-						biblionumber => $biblionumber,
-						);
+$template->param(BIBLIO_RESULTS => $resultsarray,
+				ITEM_RESULTS => $itemsarray,
+				WEB_RESULTS => $webarray,
+				SITE_RESULTS => $sitearray,
+				subscriptionsnumber => $subscriptionsnumber,
+);
 
 output_html_with_http_headers $query, $cookie, $template->output;
-
-
-# Local Variables:
-# tab-width: 8
-# End:
diff --git a/koha-tmpl/intranet-tmpl/default/en/about.tmpl b/koha-tmpl/intranet-tmpl/default/en/about.tmpl
index cb0df10ff9..4254e5d390 100644
--- a/koha-tmpl/intranet-tmpl/default/en/about.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/about.tmpl
@@ -12,43 +12,45 @@
 		<p><label class="label100">Apache version</label><!-- TMPL_VAR ESCAPE=HTML name="apacheVersion" --></p>
 	</div>
 	<div id="bloc25">
-		<h2>Special thanks to the following funders</h2>
-		<p><b>Horowhenua Library Trust</b> and Rosalie Blake, Head of Libraries, (Koha 1.0)</p>
-		<p>The <b>Nelsonville Public Library</b> (MARC support)</p>
-		<p><b>EMN (Ecole des Mines de Nantes)</b> (Suggestion, stats modules and improved ldap support)</p>
-		<p><b>ENSMP (Ecole Nationale Supérieure des Mines de Paris)</b> (biblio frameworks, MARC authorities, OPAC basket, Serials support)</p>
+		<h2>Special thanks to the following libraries</h2>
+		<p><b>Horowhenua Library Trust</b>, New Zealand, and Rosalie Blake, Head of Libraries, (Koha 1.0)</p>
+		<p>The <b>Nelsonville Public Library</b>, USA, Ohio (MARC support funding)</p>
+		<p><b>EMN (Ecole des Mines de Nantes)</b>, France (Suggestion, stats modules and improved ldap support funding)</p>
+		<p><b>ENSMP (Ecole Nationale Supérieure des Mines de Paris)</b>, France (biblio frameworks, MARC authorities, OPAC basket, Serials support funding)</p>
 	</div>
 	<div id="bloc25">
 		<h2>Core team for 2.2</h2>
 		<p><b>Rachel Hamilton-Williams</b>, Kaitiaki</p>
-		<p><b>Paul Poulain</b>, 2.2 release manager (MARC developper)</p>
-		<p>Stephen Hedges &amp; the <b>Nelsonville Public Library</b> (MARC features funders)</p>
-		<p>Nicholas Rosasco, (Documentation Compiler)</p>
-		<p>Mike Hansen</p>
-		<p>MJ Ray and <b>Turo Technology LLP</b>, (quality control, installer &amp; updater, 2.0 release maintainer)</p>
-		<p><b>Katipo Communications</b></p>
+		<p><b>Paul Poulain</b>, 2.2 release manager (MARC developer)</p>
+		<p>Stephen Hedges, Owen Leonard, Joshua Ferraro (<b>Nelsonville Public Library</b>)</p>
+		<p><b>Katipo Communications</b> (Koha 1.0 developers)</p>
 		<ul>
 			<p>Rachel Hamilton-Williams, General Manager (Webmistress)</p>
 			<p>Chris Cormack, 1.2 release manager</p>
 			<p>and Simon Blake, Amanda Atkins, Operations Manager, Olwen Williams, Finlay Thompson,</p>
 			<p>Gynn Lomax, Richard Anderson, Jeremy Blake, Rebecca Holden, Olive T. Canine</p>
 		</ul>
+		<p>Emiliano Marmonti, Matías Veleda & Sebastian Catañeda <b>La Plata University, Argentina</b> (barcode printing)</p>
+		<p>MJ Ray and <b>Turo Technology LLP</b>, (quality control, installer &amp; updater, 2.0 release maintainer)</p>
+		<p>Nicholas Rosasco, (Documentation Compiler)</p>
+		<p>Mike Hansen</p>
+		<p><b>Pate Eyler</b> (Kaitiaki from 2002 to 2004)</p>
 	</div>
 	<div id="bloc25">
 	<h2>Thanks to</h2>
 					<p>Adam Thick</p>
 					<p>Andrew Hooper</p>
 					<p>Al Banks</p>
-					<p>Ambrose Li (chinese & translation tool)</p>
-					<p>Andrew Arensburger (the small & great C4::Context module)</p>
+					<p>Ambrose Li (translation tool)</p>
+					<p>Andrew Arensburger (the small &amp; great C4::Context module)</p>
 					<p>Benedykt P. Barszcz (Polish for 2.0)</p>
 					<p>Brig C. McCoy</p>
 					<p>Daniel Holth</p>
 					<p>David Strainchamps</p>
 					<p>Dorian Meid (German translation)</p>
-					<p><b>doXulting</b> (Matthieu Branlat) OPAC basket</p>
+					<p>doXulting (Matthieu Branlat) OPAC basket</p>
 					<p>Ed Summers (Some code and Perl packages like MARC::Record)</p>
-					<p><b>Esiee School</b> (Jérome Vizcaino, Michel Lerenard, Pierre Cauchois)</p>
+					<p>Esiee School (Jérome Vizcaino, Michel Lerenard, Pierre Cauchois)</p>
 					<p>Florian Bischof</p>
 					<p>Francisco M. Marzoa Alonso</p>
 					<p>Glen Stewart</p>
@@ -66,7 +68,15 @@
 					<p>Roger Buck</p>
 					<p>Ron Wickersham</p>
 					<p>Sebastiaan Durand</p>
-					<p><b>Steve Tonnesen</b> (early MARC work, Virtual Bookshelves concept, KohaCD)</p>
+					<p>Steve Tonnesen (early MARC work, Virtual Bookshelves concept, KohaCD)</p>
+					<p>Universidad ORT Uruguay (Ernesto Silva, Andres Tarallo)</p>
+	</div>
+	<div id="bloc25">
+	<h2>Translation</h2>
+		<p><label>French</label>Pascale Nalon (ENSMP) and Jean Yves Lemaire (Saint Germain sur Morin)</p>
+		<p><label>Chinese</label>Ambrose Li</p>
+		<p><label>Spanish</label>Andres Tarallo</p>
+		<p><label>Italian</label>Giuseppe Angilella</p>
 	</div>
 </div>
 <!-- TMPL_INCLUDE NAME="about-bottom.inc" -->
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 13366d2299..7be3d6c21f 100644
--- a/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl
@@ -68,7 +68,7 @@
 				<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" -->
 				<!-- TMPL_IF name="repeatable" -->
-					<a href="javascript:AddField(<!-- TMPL_VAR NAME="tag" -->)">+</a>
+					<a href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')">+</a>
 				<!-- /TMPL_IF -->
 				</p>
 			<!-- /TMPL_IF -->
@@ -99,7 +99,7 @@
 				<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" -->
 				<!-- TMPL_IF name="repeatable" -->
-					<a href="javascript:AddField(<!-- TMPL_VAR NAME="tag" -->)">+</a>
+					<a href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')">+</a>
 				<!-- /TMPL_IF -->
 				</p>
 			<!-- /TMPL_IF -->
@@ -130,7 +130,7 @@
 				<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" -->
 				<!-- TMPL_IF name="repeatable" -->
-					<a href="javascript:AddField(<!-- TMPL_VAR NAME="tag" -->)">+</a>
+					<a href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')">+</a>
 				<!-- /TMPL_IF -->
 				</p>
 			<!-- /TMPL_IF -->
@@ -161,7 +161,7 @@
 				<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" -->
 				<!-- TMPL_IF name="repeatable" -->
-					<a href="javascript:AddField(<!-- TMPL_VAR NAME="tag" -->)">+</a>
+					<a href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')">+</a>
 				<!-- /TMPL_IF -->
 				</p>
 			<!-- /TMPL_IF -->
@@ -192,7 +192,7 @@
 				<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" -->
 				<!-- TMPL_IF name="repeatable" -->
-					<a href="javascript:AddField(<!-- TMPL_VAR NAME="tag" -->)">+</a>
+					<a href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')">+</a>
 				<!-- /TMPL_IF -->
 				</p>
 			<!-- /TMPL_IF -->
@@ -223,7 +223,7 @@
 				<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" -->
 				<!-- TMPL_IF name="repeatable" -->
-					<a href="javascript:AddField(<!-- TMPL_VAR NAME="tag" -->)">+</a>
+					<a href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')">+</a>
 				<!-- /TMPL_IF -->
 				</p>
 			<!-- /TMPL_IF -->
@@ -254,7 +254,7 @@
 				<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" -->
 				<!-- TMPL_IF name="repeatable" -->
-					<a href="javascript:AddField(<!-- TMPL_VAR NAME="tag" -->)">+</a>
+					<a href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')">+</a>
 				<!-- /TMPL_IF -->
 				</p>
 			<!-- /TMPL_IF -->
@@ -285,7 +285,7 @@
 				<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" -->
 				<!-- TMPL_IF name="repeatable" -->
-					<a href="javascript:AddField(<!-- TMPL_VAR NAME="tag" -->)">+</a>
+					<a href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')">+</a>
 				<!-- /TMPL_IF -->
 				</p>
 			<!-- /TMPL_IF -->
@@ -316,7 +316,7 @@
 				<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" -->
 				<!-- TMPL_IF name="repeatable" -->
-					<a href="javascript:AddField(<!-- TMPL_VAR NAME="tag" -->)">+</a>
+					<a href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')">+</a>
 				<!-- /TMPL_IF -->
 				</p>
 			<!-- /TMPL_IF -->
@@ -347,7 +347,7 @@
 				<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" -->
 				<!-- TMPL_IF name="repeatable" -->
-					<a href="javascript:AddField(<!-- TMPL_VAR NAME="tag" -->)">+</a>
+					<a href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')">+</a>
 				<!-- /TMPL_IF -->
 				</p>
 			<!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl
index 17326b3212..e3275be4d8 100644
--- a/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl
@@ -36,6 +36,7 @@
 				<!-- TMPL_ELSE -->
 					<th class="acquisition">Remove</th>
 				<!-- /TMPL_IF -->
+
 			</tr>
 			<!-- TMPL_LOOP NAME="books_loop" -->
 				<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="color" -->">
@@ -55,10 +56,11 @@
 					<td><!-- TMPL_VAR NAME="bookfundid" --></td>
 					<!-- TMPL_IF name="closedate" -->
 					<!-- TMPL_ELSE -->
-						<td><a href="addorder.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->&quantity=0&biblio=<!-- TMPL_VAR NAME="biblionumber" -->">
-						<img src="/intranet-tmpl/default/images/edittrash.png" alt="Remove from basket" title="Remove from basket" width="32" hspace="0" vspace="0" border="0">
-					</a>
-						</a></td>
+						<td>
+							<a href="addorder.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->&quantity=0&biblio=<!-- TMPL_VAR NAME="biblionumber" -->">
+								<img src="/intranet-tmpl/default/images/edittrash.png" alt="Remove from basket" title="Remove from basket" width="32" hspace="0" vspace="0" border="0">
+							</a>
+						</td>
 					<!-- /TMPL_IF -->
 				</tr>
 			<!-- /TMPL_LOOP -->
diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/histsearch.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/histsearch.tmpl
index f942575370..252ab689c9 100644
--- a/koha-tmpl/intranet-tmpl/default/en/acqui/histsearch.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui/histsearch.tmpl
@@ -10,6 +10,8 @@
 			<th class="acquisition">Placed on</th>
 			<th class="acquisition">Recieved on</th>
 			<th class="acquisition">Quantity ordered</th>
+			<th class="acquisition">Unit cost</th>
+			<th class="acquisition">&nbsp;</th>
 		</tr>
 		<tr>
 			<form>
@@ -34,6 +36,9 @@
 				<th class="acquisition">
 					&nbsp;
 				</th>
+				<th class="acquisition">
+					&nbsp;
+				</th>
 				<th class="acquisition">
 					<input type="submit" class="button acquisition" value="Set Filter">
 				</th>
@@ -62,6 +67,9 @@
 				<td>
 					<!-- TMPL_VAR name="quantity" -->
 				</td>
+				<td>
+					<!-- TMPL_VAR name="ecost" -->
+				</td>
 			</tr>
 		<!-- /TMPL_LOOP -->
 	</table>
diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl
index a7106cdd54..8aeb496eff 100644
--- a/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl
@@ -5,6 +5,9 @@
 function update(f){
   //collect values
   quantity=f.quantity.value
+  if (quantity ==0) {
+  	alert("Quantity must be >0");
+  }
   discount=f.discount.value
   listinc=parseInt(f.listinc.value)
   currency=f.currency.value
@@ -32,20 +35,34 @@ function update(f){
   f.ecost.value=ecost;
   f.GST.value=GST;
   f.total.value=total;
-
+  return true;
 }
 
 
 
 function messenger(X,Y,etc){
-win=window.open("","mess","height="+X+",width="+Y+",screenX=150,screenY=0");
-win.focus();
-win.document.close();
-win.document.write("<body link='#333333' bgcolor='#ffffff' text='#000000'><font size='2'><p><br>");
-win.document.write(etc);
-win.document.write("<center><form><input type=button onclick='self.close()' value='Close'></form></center>");
-win.document.write("</font></body></html>");
+	win=window.open("","mess","height="+X+",width="+Y+",screenX=150,screenY=0");
+	win.focus();
+	win.document.close();
+	win.document.write("<body link='#333333' bgcolor='#ffffff' text='#000000'><font size='2'><p><br>");
+	win.document.write(etc);
+	win.document.write("<center><form><input type=button onclick='self.close()' value='Close'></form></center>");
+	win.document.write("</font></body></html>");
+}
+
+function check(f) {
+  quantity=f.quantity.value
+  if (title == "") {
+  	alert("Title can't be empty");
+	return false;
+  }
+  if (quantity ==0) {
+  	alert("Quantity must be >0");
+	return false;
+  }
+	document.frusin.submit();
 }
+
 //-->
 
 </script>
@@ -187,7 +204,7 @@ win.document.write("</font></body></html>");
 			<input type="text" size="20" name=sort2 value="<!-- TMPL_VAR NAME="sort2" -->">
 		</p>
 		<p>
-			<input type="submit" value="OK" class="button acquisition">
+			<input type="button" value="OK" class="button acquisition" onClick="check(this.form)">
 		</p>
 	</form>
 	</div>
diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl
index 9688ddd522..dbce6d4d1e 100644
--- a/koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl
@@ -14,15 +14,15 @@
 		<h2 class="acquisition">COMPANY DETAILS</h2>
 		<p>
 			<label>Company Name</label>
-			<input type="text" size="20" name="company" value="<!-- TMPL_VAR NAME="name" -->">
+			<input type="text" size="40" name="company" value="<!-- TMPL_VAR NAME="name" -->">
 		</p>
 		<p>
 			<label>Postal Address</label>
-				<textarea name="company_postal" cols="20" rows="3"><!-- TMPL_VAR NAME="postal" --></textarea>
+				<textarea name="company_postal" cols="40" rows="3"><!-- TMPL_VAR NAME="postal" --></textarea>
 		</p>
 		<p>
 			<label>Physical Address</label>
-			<textarea name="physical" cols="20" rows="4"><!-- TMPL_VAR NAME="address1" --><!-- TMPL_VAR NAME="address2" --><!-- TMPL_VAR NAME="address3" --><!-- TMPL_VAR NAME="address4" --></textarea>
+			<textarea name="physical" cols="40" rows="4"><!-- TMPL_VAR NAME="address1" --><!-- TMPL_VAR NAME="address2" --><!-- TMPL_VAR NAME="address3" --><!-- TMPL_VAR NAME="address4" --></textarea>
 		</p>
 		<p>
 			<label>Phone</label>
@@ -34,16 +34,16 @@
 		</p>
 		<p>
 			<label>Website</label>
-			<input type="text" size="20" name="website" value="<!-- TMPL_VAR NAME="url" -->">
+			<input type="text" size="40" name="website" value="<!-- TMPL_VAR NAME="url" -->">
 		</p>
 		<h2 class="acquisition">CONTACT DETAILS</h2>
 		<p>
 			<label>Contact Name</label>
-			<input type="text" size="20" name="company_contact_name" value="<!-- TMPL_VAR NAME="contact" -->">
+			<input type="text" size="40" name="company_contact_name" value="<!-- TMPL_VAR NAME="contact" -->">
 		</p>
 		<p>
 			<label>Position</label>
-			<input type="text" size="20" name="company_contact_position" value="<!-- TMPL_VAR NAME="contpos" -->">
+			<input type="text" size="40" name="company_contact_position" value="<!-- TMPL_VAR NAME="contpos" -->">
 		</p>
 		<p>
 			<label>Phone</label>
@@ -59,11 +59,11 @@
 		</p>
 		<p>
 			<label>E-mail</label>
-			<input type="text" size="20" name="company_email" value="<!-- TMPL_VAR NAME="contemail" -->">
+			<input type="text" size="40" name="company_email" value="<!-- TMPL_VAR NAME="contemail" -->">
 		</p>
 		<p>
 			<label>Notes</label>
-			<textarea name="notes" cols="20" rows="4"><!-- TMPL_VAR NAME="contnotes" --></textarea>
+			<textarea name="notes" cols="40" rows="4"><!-- TMPL_VAR NAME="contnotes" --></textarea>
 		</p>
 	</div>
 	<div id="bloc25">
diff --git a/koha-tmpl/intranet-tmpl/default/en/authorities/auth_finder.tmpl b/koha-tmpl/intranet-tmpl/default/en/authorities/auth_finder.tmpl
index ed58185dd1..63fa0b9e2d 100644
--- a/koha-tmpl/intranet-tmpl/default/en/authorities/auth_finder.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/authorities/auth_finder.tmpl
@@ -11,15 +11,29 @@
 		<h2 class="authority">Search on</h2>
 		<p>
 			<label class="label100">Authority type</label>
-			<!-- TMPL_VAR NAME="category" -->
+			<!-- TMPL_VAR NAME="authtypecode" -->
+			<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->">
 		</p>
 		<p>
-			<label class="label100">Search value</label><input type="text" name="value" value="<!-- TMPL_VAR name="resultstring" -->">
-			<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="category" -->">
+			<label class="label100">Main entry</label><input type="text" name="value" value="<!-- TMPL_VAR name="resultstring" -->">
+			<input type="hidden" name="marclist" value="mainentry">
+			<input type="hidden" name="and_or" value="and">
+			<input type="hidden" name="excluding" value="">
+			<select name="operator">
+				<option value="contains">contains</option>
+				<option value="start">start by</option>
+			</select>
+			<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
+		</p>
+		<p>
+			<label class="label100">Anywhere</label><input type="text" name="value">
 			<input type="hidden" name="marclist" value="">
 			<input type="hidden" name="and_or" value="and">
 			<input type="hidden" name="excluding" value="">
-			<input type="hidden" name="operator" value="contains">
+			<select name="operator">
+				<option value="contains">contains</option>
+				<option value="start">start by</option>
+			</select>
 			<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
 		</p>
 		<p>
diff --git a/koha-tmpl/intranet-tmpl/default/en/authorities/authorities-home.tmpl b/koha-tmpl/intranet-tmpl/default/en/authorities/authorities-home.tmpl
index e6176e7f9c..4380a27cea 100644
--- a/koha-tmpl/intranet-tmpl/default/en/authorities/authorities-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/authorities/authorities-home.tmpl
@@ -8,9 +8,7 @@
 	<input type="hidden" name="type" value="intranet">
 	<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->">
 	<div id="bloc25">
-		<h2 class="authority">Search on</h2>
-		<p>
-			<label class="label100">Authority type</label>
+		<h2 class="authority">Search on
 			<select name="authtypecode">
 			<!-- TMPL_LOOP NAME="authtypesloop" -->
 				<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->>
@@ -18,14 +16,28 @@
 				</option>
 			<!-- /TMPL_LOOP -->
 			</select>
+		</h2>
+		<p>
+			<label class="label100">Main entry</label>
+			<input type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->">
+			<input type="hidden" name="marclist" value="mainentry">
+			<input type="hidden" name="and_or" value="and">
+			<input type="hidden" name="excluding" value="">
+			<select name="operator">
+				<option value="contains">contains</option>
+				<option value="start">start by</option>
+			</select>
 		</p>
 		<p>
-			<label class="label100">Search value</label>
+			<label class="label100">Anywhere</label>
 			<input type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->">
 			<input type="hidden" name="marclist" value="">
 			<input type="hidden" name="and_or" value="and">
 			<input type="hidden" name="excluding" value="">
-			<input type="hidden" name="operator" value="contains">
+			<select name="operator">
+				<option value="contains">contains</option>
+				<option value="start">start by</option>
+			</select>
 		</p>
 		<p>
 			<input type="submit" value="Start search" class="button authority">
diff --git a/koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist-auth.tmpl b/koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist-auth.tmpl
index b3b79c9c3c..719775ea56 100644
--- a/koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist-auth.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist-auth.tmpl
@@ -10,15 +10,29 @@
 				<h2 class="authority">Search on</h2>
 				<p>
 					<label class="label100">Authority type</label>
-					<!-- TMPL_VAR NAME="category" -->
+					<!-- TMPL_VAR NAME="authtypecode" -->
+					<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->">
 				</p>
 				<p>
-					<label class="label100">Search value</label><input type="text" name="value" value="<!-- TMPL_VAR name="resultstring" -->">
-					<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->">
+					<label class="label100">Main entry</label><input type="text" name="value" value="<!-- TMPL_VAR name="resultstring" -->">
+					<input type="hidden" name="marclist" value="mainentry">
+					<input type="hidden" name="and_or" value="and">
+					<input type="hidden" name="excluding" value="">
+					<select name="operator">
+						<option value="contains">contains</option>
+						<option value="start">start by</option>
+					</select>
+					<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
+				</p>
+				<p>
+					<label class="label100">Anywhere</label><input type="text" name="value">
 					<input type="hidden" name="marclist" value="">
 					<input type="hidden" name="and_or" value="and">
 					<input type="hidden" name="excluding" value="">
-					<input type="hidden" name="operator" value="contains">
+					<select name="operator">
+						<option value="contains">contains</option>
+						<option value="start">start by</option>
+					</select>
 					<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
 				</p>
 				<p>
diff --git a/koha-tmpl/intranet-tmpl/default/en/bull/bull-home.tmpl b/koha-tmpl/intranet-tmpl/default/en/bull/bull-home.tmpl
index a804fe3f07..0f68fad5f3 100644
--- a/koha-tmpl/intranet-tmpl/default/en/bull/bull-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/bull/bull-home.tmpl
@@ -23,7 +23,7 @@
 		<!-- TMPL_LOOP name="subscriptions" -->
 			<tr>
 				<td>
-					<!-- TMPL_VAR name="title" -->
+					<!-- TMPL_VAR name="title" --> <!-- TMPL_IF name="notes" -->(<!-- TMPL_VAR name="notes" -->)<!-- /TMPL_IF -->
 				</td>
 				<td>
 					<!-- TMPL_VAR name="ISSN" -->
diff --git a/koha-tmpl/intranet-tmpl/default/en/bull/result.tmpl b/koha-tmpl/intranet-tmpl/default/en/bull/result.tmpl
index 8653e6a4f2..d748109750 100644
--- a/koha-tmpl/intranet-tmpl/default/en/bull/result.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/bull/result.tmpl
@@ -4,7 +4,7 @@
 	<div id="resultnumber">
 		<p>
 			<!-- 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>
+				<a href=subscription-bib-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 -->
@@ -12,11 +12,11 @@
 				<!-- 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>
+					<a href=subscription-bib-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>
+				<a href=subscription-bib-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 -->
 		</p>
 		<p>
@@ -47,7 +47,7 @@
 					</p>
 				</td>
 				<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
-						<a class="transparent" href="#" onclick="GetIt('<!-- TMPL_VAR NAME="biblionumber" -->','<!-- TMPL_VAR name="title" -->') ">Get it!</a>
+						<a class="transparent" href="#" onclick="GetIt('<!-- TMPL_VAR NAME="biblionumber" -->','<!-- TMPL_VAR name="title" escape="URL" -->') ">Get it!</a>
 				</td>
 			</tr>
 			<!-- /TMPL_LOOP -->
@@ -56,17 +56,17 @@
 	<div id="resultnumber">
 		<p>
 			<!-- 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>
+			<a href=subscription-bib-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>
+				<a href=subscription-bib-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>
+			<a href=subscription-bib-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 -->
 		</p>
 	</div>	
diff --git a/koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl b/koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl
index b276fff2da..9e3ec109b0 100644
--- a/koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl
@@ -5,6 +5,9 @@
 <a href="subscription-add.pl?op=mod&subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="button bull">Edit</a>
 <a href="statecollection.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="button bull">Issues</a>
 <a href="/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button bull">Biblio</a>
+<!-- TMPL_UNLESS name="totalissues" -->
+	<a href="subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->&op=del" class="button bull">Delete subscription</a>
+<!-- /TMPL_UNLESS -->
 <form method="post" name="f">
 <div id="bloc25">
 	<h2 class="bull">Subscription information</h2>
diff --git a/koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl b/koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl
index 224681bdc4..67c150cc59 100644
--- a/koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl
@@ -25,12 +25,9 @@
 		<a href="javascript:Dopop('detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">
 			Print
 		</a>
-		<!-- TMPL_IF name="subscriptionid" -->
-		<a href="bull/subscription-detail.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->" class="button catalogue">
-			Subscription
-		</a>
-		<a href="bull/serial-issues.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->" class="button catalogue" title="Serial issues">
-			Issues
+		<!-- TMPL_IF name="subscriptionsnumber" -->
+		<a href="bull-home.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
+			Subscription(s)
 		</a>
 		<!-- /TMPL_IF -->
 		<!-- TMPL_IF NAME="norequests" -->
diff --git a/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl b/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl
index f9957fdc04..344ed82c14 100644
--- a/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl
@@ -12,28 +12,50 @@
 		<a class="button catalogue" href="request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">Requests</a>
 	<!-- /TMPL_IF -->
 	<div id="bloc25">
-		<h2 class="catalogue">BIBLIO RECORD <!-- TMPL_VAR NAME="biblionumber" --></h2>
-		<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><br><!-- /TMPL_IF -->
-			<!-- 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/opac-searchresults.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_VAR NAME="pages" --><!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="size" -->, <!-- TMPL_VAR NAME="size" --><br><!-- /TMPL_IF -->
-			<!-- 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> <a href="/cgi-bin/koha/opac-searchresults.pl?type=opac&amp;dewey=<!-- TMPL_VAR NAME="dewey" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="dewey" --></a><br><!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="classification" --><b>Classification:</b> <!-- TMPL_VAR NAME="classification" --><br><!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="lccn" --><b>LCCN:</b> <!-- TMPL_VAR NAME="lccn" --><br><!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="url" --><b>URL:</b> <a href="<!-- TMPL_VAR NAME="url" -->"><!-- TMPL_VAR NAME="url" --></a><br><!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="subjects" --><b>Subjects:</b> <!-- TMPL_VAR NAME="subjects" --><br><!-- /TMPL_IF -->
-			<b>Total Number of Items:</b> <!-- TMPL_VAR NAME="count" -->
+	<table class="small">
+		<!-- BIBLIO RECORD TABLE -->
+		<tr>
+			<th class="catalogue">
+				<!-- TMPL_VAR NAME="title" -->  (record <!-- TMPL_VAR NAME="biblionumber" -->)
+			</th>
+		</tr>
+		<tr>
+			<td>
+				<!-- TMPL_IF name="subtitles" -->
+					<label class="label100"><b>Subtitle(s):</b> </label>
+					<!-- TMPL_LOOP name="subtitles" -->
+						<!-- TMPL_VAR NAME="subtitle" --> ; 
+					<!-- /TMPL_LOOP -->
+					<br />
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF name="author" --><label class="label100"><b>Author:</b> </label><!-- TMPL_VAR NAME="author" --><br /><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="additional" --><label class="label100"><b>Additional Author:</b></label><!-- TMPL_VAR NAME="additional" --><br /><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="publishercode" --><label class="label100"><b>Published by :</b></label><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="publishercode" --><br />
+				<!-- TMPL_IF name="publicationyear" --><label class="label100"><b>in </b></label><!-- /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" --><label class="label100"><b>ISBN:</b> </label><!-- TMPL_VAR NAME="isbn" --><br /><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="seriestitle" --><label class="label100"><b>Collection:</b> </label><!-- TMPL_VAR NAME="seriestitle" --><br /><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="subjects" --><label class="label100"><b>Subject(s):</b> </label>
+					<!-- TMPL_LOOP name="subjects" -->
+						<a href="/cgi-bin/koha/opac-search.pl?op=do_search&marclist=bibliosubject.subject&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="subject" escape="HTML"-->"><!-- TMPL_VAR NAME="subject" --></a>, <!-- /TMPL_LOOP -->
+					<br /><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="copyrightdate" --><label class="label100"><b>Year :</b> </label><!-- TMPL_VAR NAME="copyrightdate" --><br /><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="notes" --><label class="label100"><b>Notes:</b> </label><!-- TMPL_VAR NAME="notes" --><br /><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="unititle" --><label class="label100"><b>Unititle:</b> </label><!-- TMPL_VAR NAME="unititle" --><br /><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="dewey" --><label class="label100"><b>Dewey:</b></label><!-- TMPL_VAR name="dewey" --><br /><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="url" --><label class="label100"><b>URL:</b> </label><a href="<!-- TMPL_VAR name="url" -->"><!-- TMPL_VAR NAME="url" --></a><br /><!-- /TMPL_IF -->
+				<label class="label100"><b>Item type : </b></label>
+					<!-- TMPL_IF name="description" -->
+						<!-- TMPL_VAR name="description" -->
+					<!-- TMPL_ELSE -->
+						<!-- TMPL_VAR NAME="itemtype" -->
+					<!-- /TMPL_IF -->
+					<br/>
+				<b>Total Number of Items:</b> <!-- TMPL_VAR NAME="count" -->
+			</td>
+		</tr>
+	</table>
 	</div>
 <!-- /TMPL_LOOP -->
 <div id="bloc25">
@@ -42,6 +64,7 @@
 		<tr>
 			<th class="catalogue">Item type</th>
 			<th class="catalogue">Location</th>
+			<th class="catalogue">Status</th>
 			<th class="catalogue">Date Due</th>
 			<th class="catalogue">Last seen</th>
 			<th class="catalogue">Barcode</th>
@@ -51,6 +74,13 @@
 			<tr>
 				<td><!-- TMPL_VAR NAME="description" --></td>
 				<td><!-- TMPL_VAR NAME="branchname" --> <!-- TMPL_IF NAME="itemcallnumber" --> <!-- TMPL_VAR NAME="itemcallnumber" --><!-- /TMPL_IF --></td>
+				<td>
+					<!-- TMPL_IF name="datedue" -->
+						On issue to <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="cardnumber" --></a>
+					<!-- TMPL_ELSE -->
+						<!-- TMPL_VAR name="notforloan" -->
+					<!-- /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" -->&amp;bib=<!-- TMPL_VAR NAME="biblionumber" -->&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->"><!-- TMPL_VAR NAME="barcode" --></a></td>
diff --git a/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl
index ec53f8de66..5fc45c971b 100644
--- a/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl
@@ -31,8 +31,8 @@
 		<!-- TMPL_IF NAME="borrowernumber" -->
 			<h2 class="circulation">Borrower information</h2>
 			<p>
-				<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->" onclick="openWindow(this,'Member', 480, 640)">
-					<!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" -->
+				<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" --> " onclick="openWindow(this,'Member', 480, 640)">
+					<!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> (<!-- TMPL_VAR name="cardnumber" -->)
 				</a>
 			</p>
 			<p>
@@ -44,7 +44,16 @@
 			<p>Category: <!-- TMPL_VAR NAME="categorycode" --></p>
 			<p><!-- TMPL_VAR NAME="issuecount" --> Issues<!-- TMPL_IF NAME="overduecount" -->, <!-- TMPL_VAR NAME="overduecount" --> Overdue<!-- /TMPL_IF --></p>
 			<p><b><!-- TMPL_VAR NAME="borrowernotes" --></b></p>
-
+  			<!-- TMPL_IF NAME="dbarred" -->
+				<span class="error">Debarred:</span> Patron is debarred 
+				<form action="/cgi-bin/koha/members/setdebar.pl" method="post">
+					<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
+					<input type="hidden" name="cardnumber" value="<!-- TMPL_VAR NAME="cardnumber" -->" />
+					<input type="hidden" value="circ" name="destination" />
+					<input type="hidden" name="status" value="0" />
+					<input type="submit" class="button circulation" value="Lift Debarment" />
+				</form>
+			<!-- /TMPL_IF -->
 		<!-- TMPL_ELSE -->
 				<h2 class="circulation">
 					Enter borrower card number or partial last name
diff --git a/koha-tmpl/intranet-tmpl/default/en/export/marc.tmpl b/koha-tmpl/intranet-tmpl/default/en/export/marc.tmpl
index e4ab6df7a2..889b5ae08f 100644
--- a/koha-tmpl/intranet-tmpl/default/en/export/marc.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/export/marc.tmpl
@@ -1,15 +1,17 @@
 <!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
 
-<center>
-<h1>MARC biblio export</h1><br /><br /><br />
-Export in MARC format the following biblios :
-<form method="post">
-<p>from biblio number : <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>(leave blank to export every biblio)</p>
-<p>Note : the items are NOT exported by this tool</p>
+<div id="mainbloc">
+<h1>MARC biblio export</h1>
+	<div id="bloc25">
+		<h2 class="parameters">Select biblios to export</h2>
+		<form method="post">
+			<p>from biblio number : <input type="text" name="start_bib">
+			to biblio number : <input type="text" name="end_bib"></p>
+			<input type="hidden" name="op" value="export">
+			<p>(leave blank to export every biblio)</p>
+			<p>Note : the items are NOT exported by this tool</p>
+			<input type="submit" value="Export" class="button">
+		</form>
+	</div>
+</div>
 <!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/en/help/search.marc/search.tmpl b/koha-tmpl/intranet-tmpl/default/en/help/search.marc/search.tmpl
index 15036f6b1d..7745f5bc41 100644
--- a/koha-tmpl/intranet-tmpl/default/en/help/search.marc/search.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/help/search.marc/search.tmpl
@@ -8,8 +8,9 @@
 			<li>Title</li>
 			<li>Author</li>
 			<li>Barcode : the library barcode of the book</li>
-			<li>Illustrator</li>
 			<li>Dewey</li>
+			<li>Call number</li>
+			<li>ISBN</li>
 			<li>Item type : select here an item type. If none is selected, the search is done on every item type</li>
 			<li>Branch : select here a specific branch. If none selected, the search is done on every branch</li>
 		</ul>
diff --git a/koha-tmpl/intranet-tmpl/default/en/members/member.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/member.tmpl
index 40c56081d8..b471c2ef61 100644
--- a/koha-tmpl/intranet-tmpl/default/en/members/member.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/member.tmpl
@@ -6,6 +6,11 @@
 	<div class="bloctitle">Search on</div>
 	<form action="/cgi-bin/koha/members/member.pl" method="post">
 		<input type="text" name="member" value="<!-- TMPL_VAR NAME="member" -->">
+		order by 
+		<select name="orderby">
+			<option value="surname,firstname">Surname</option>
+			<option value="cardnumber">Cardnumber</option>
+		</select>
 		<input type="submit" class="button" value="OK">
 	</form>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl
index 99065a36d3..c37377ceb8 100644
--- a/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl
@@ -44,6 +44,7 @@
 		<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="actionType" value="<!-- TMPL_VAR NAME="actionType" -->">
 		<!-- TMPL_IF NAME="addAction" -->
 			<input type="hidden" name="op" value="add">
 		<!-- TMPL_ELSE -->
@@ -51,7 +52,7 @@
 		<!-- /TMPL_IF -->
 		<table>
 			<tr>
-				<td colspan="5">Member# <!-- TMPL_VAR NAME="member" -->, Card number* <input type="text" name="cardnumber" size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->"></td>
+				<td colspan="5"><b>Member# <!-- TMPL_VAR NAME="member" -->, Card number*</b> <input type="text" name="cardnumber" size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->"></td>
 			</tr>
 			<tr>
 				<th colspan="5">MEMBER <!-- TMPL_UNLESS name="institution" -->PERSONAL<!-- /TMPL_UNLESS --> DETAILS</th>
@@ -146,7 +147,7 @@
 
 			<tr>
 				<td  colspan="2"><b>Postal Address*</b></td>
-				<td><b>Zipcode</b></td>
+				<td>Zipcode</td>
 				<td><b> Town*</b></td>
 				<td>Joining Branch</td>
 			</tr>
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 81c067a3ff..3aa9bcd924 100644
--- a/koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl
@@ -5,7 +5,12 @@
 <div id="bloc25">
 	<div class="bloctitle">Member Search</div>
 	<form action="/cgi-bin/koha/members/member.pl" method="post">
-		<input type="text" size="50" name="member" >
+		<p><input type="text" size="30" name="member" >
+		order by 
+		<select name="orderby">
+			<option value="surname,firstname">Surname</option>
+			<option value="cardnumber">Cardnumber</option>
+		</select>
 		<input type="submit" class="button" value="OK">
 		<p>Renew Items, view add, modify and delete records, all by starting with this search.</p>
 		<p>Type a borrower name, part of a name, or number in the field above and hit the enter key to activate search</p>
diff --git a/koha-tmpl/intranet-tmpl/default/en/members/moremember-print.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/moremember-print.tmpl
new file mode 100644
index 0000000000..264c790124
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/default/en/members/moremember-print.tmpl
@@ -0,0 +1,61 @@
+<!-- TMPL_INCLUDE NAME="members-top.inc" -->
+
+<!-- main site -->
+<div id="mainbloc">
+<h2 class="members">Account Summary: <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)</h2>
+<ul>
+	<p><!-- TMPL_VAR NAME="streetaddress" --></p>
+	<p><!-- TMPL_VAR NAME="city" -->, <!-- TMPL_VAR NAME="zipcode" --></p>
+	<p><!-- TMPL_IF NAME="phone" --><!-- TMPL_VAR NAME="phone" --><!-- TMPL_ELSE -->(no phone number on file)<!-- /TMPL_IF --></p>
+	<p><!-- TMPL_IF NAME="emailaddress" --><!-- TMPL_VAR NAME="emailaddress" --><!-- TMPL_ELSE -->(no email on file)<!-- /TMPL_IF --></p>
+</ul>
+<a href="/cgi-bin/koha/circ/circulation.pl?findborrower=<!-- TMPL_VAR NAME="cardnumber" -->" class="button">Issue books</a>
+<table>
+	<caption>Items Checked Out</caption>
+	<tr>
+		<th>Title</th>
+		<th>Author</th>
+		<th>Format</th>
+		<th>Date Due</th>
+		<th>Status</th>
+	</tr>
+
+	<!-- TMPL_loop name="issueloop" -->
+	<tr<!-- TMPL_IF name="red" --> class="overdue"</TMPL_IF>>
+		<td>
+		<!-- TMPL_VAR NAME="title" -->
+		<a href="/cgi-bin/koha/detail.pl?item=<!-- TMPL_VAR NAME="itemnumber" -->&amp;bib=<!-- TMPL_VAR NAME="biblionumber" -->&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->">
+		</a>
+		</td>
+		<td><!-- TMPL_VAR NAME="author" --></td>
+		<td><!-- TMPL_VAR NAME="itemtype" --></td>
+		<td><!-- TMPL_VAR NAME="date_due" --></td>
+		<td><!-- TMPL_IF NAME="red" -->Overdue!<!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td>
+	</tr>
+	<!-- /TMPL_LOOP -->
+	</table>
+	
+<table>
+	<caption>Items on Reserve</caption>
+	<tr>
+		<th>Title</th>
+		<th>Author</th>
+		<th>Format</th>
+		<th>Requested</th>
+	</tr>
+
+<!-- TMPL_loop name="reserveloop" -->
+	<tr>
+		<td><a href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="btitle" --></a></td>
+		<td><!-- TMPL_VAR NAME="author" --></td>
+		<td><!-- TMPL_VAR NAME="description" --></td>
+		<td><!-- TMPL_VAR NAME="reservedate2" --></td>
+	</tr>
+	<!-- /tmpl_loop -->
+
+</table>
+
+</div>
+<!-- endmenu -->
+
+<!-- TMPL_INCLUDE NAME="members-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/default/en/members/moremember-receipt.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/moremember-receipt.tmpl
new file mode 100644
index 0000000000..7f08e5f563
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/default/en/members/moremember-receipt.tmpl
@@ -0,0 +1,42 @@
+<!-- TMPL_INCLUDE NAME="members-top.inc" -->
+
+<!-- main site -->
+<div id="mainbloc">
+<h2><!-- TMPL_VAR name="LibraryName" --></h2>
+<!-- TMPL_IF NAME="branchname" --><!-- TMPL_VAR NAME="branchname" --><br><!-- /TMPL_IF -->
+Issued To <a href="/cgi-bin/koha/circ/circulation.pl?findborrower=<!-- TMPL_VAR NAME="cardnumber">"><!-- TMPL_VAR NAME="cardnumber" --></a><br>
+<!-- TMPL_VAR NAME="todaysdate" --><br>
+<table>
+	<caption>Issues</caption>
+	<tr>
+		<th>Date Due</th>
+		<th>Title</th>
+	</tr>
+	<!-- TMPL_loop name="issueloop" -->
+	<!-- TMPL_IF name="red" --><!-- TMPL_ELSE -->
+		<tr>
+		<td><!-- TMPL_VAR NAME="date_due" --></td>
+		<td><a href="/cgi-bin/koha/detail.pl?item=<!-- TMPL_VAR NAME="itemnumber" -->&amp;bib=<!-- TMPL_VAR NAME="biblionumber" -->&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->"><!-- TMPL_VAR NAME="title" --></a></td>
+		</tr>
+	<!-- /TMPL_IF -->
+	<!-- /TMPL_LOOP -->
+	</table>
+	
+	<table>
+	<caption>Overdues</caption>
+	<tr>
+	<th>Date Due</th>
+	<th>Title</th>
+	</tr>
+	<!-- TMPL_LOOP NAME="issueloop" -->
+	<!-- TMPL_IF NAME="red" --><tr>
+	<td><!-- TMPL_VAR NAME="date_due" --></td>
+	<td><a href="/cgi-bin/koha/detail.pl?item=<!-- TMPL_VAR NAME="itemnumber" -->&amp;bib=<!-- TMPL_VAR NAME="biblionumber" -->&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->"><!-- TMPL_VAR NAME="title" --></a></td>
+	</tr>
+	<!-- /TMPL_IF -->
+	<!-- /TMPL_LOOP -->
+	</table>
+
+</div>
+<!-- endmenu -->
+<!-- TMPL_INCLUDE NAME="members-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl
index aff61ec63e..4c810ef9fd 100644
--- a/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl
@@ -5,40 +5,39 @@
 	<div class="bloc25">
 		<h2 class="members">Membership record</h2>
 		<!-- 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>
-		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>
-		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" --><br>
-		Membership Number: <!-- TMPL_VAR NAME="borrowernumber" --><br>
-		Membership Category: <!-- TMPL_VAR NAME="categorycode" --><br>
-		Fee: $30/year, Paid<br>
-		Joined: <!-- TMPL_VAR NAME="dateenrolled" -->,  Expires: <!-- TMPL_VAR NAME="expiry" --><br>
-		Joining branch: <!-- TMPL_VAR NAME="branchcode" -->
+		<p><label class="label100">Card number: </label><!-- TMPL_VAR NAME="cardnumber" --><br>
+		<label class="label100">Postal Address: </label><!-- TMPL_VAR NAME="streetaddress" -->, <!-- TMPL_VAR NAME="zipcode" --> <!-- TMPL_VAR NAME="city" --><br>
+		<!-- TMPL_UNLESS name="I" --><label class="label100">Home Address: </label><!-- TMPL_VAR NAME="physstreet" -->, <!-- TMPL_VAR NAME="homezipcode" --> <!-- TMPL_VAR NAME="streetcity" --><br>
+		<label class="label100">Phone home: </label><!-- TMPL_VAR NAME="phone" --><br><!-- /TMPL_UNLESS -->
+		<label class="label100">Phone daytime: </label><!-- TMPL_VAR NAME="phoneday" --><br>
+		<label class="label100">Fax: </label><!-- TMPL_VAR NAME="faxnumber" --><br>
+		<label class="label100">E-mail: </label><a href="mailto:<!-- TMPL_VAR NAME="emailaddress" -->"><!-- TMPL_VAR NAME="emailaddress" --></a><br>
+		<label class="label100">Text messaging: </label><!-- TMPL_VAR NAME="textmessaging" --><br>
+		<label class="label100">Membership Number: </label><!-- TMPL_VAR NAME="borrowernumber" --><br>
+		<label class="label100">Membership Category: </label><!-- TMPL_VAR NAME="categorycode" --><br>
+		<label class="label100">Joined: </label><!-- TMPL_VAR NAME="dateenrolled" -->,  Expires: <!-- TMPL_VAR NAME="expiry" --><br>
+		<label class="label100">Joining branch: </label><!-- TMPL_VAR NAME="branchcode" -->
 		</p>
 		<p>
 		<!-- TMPL_IF NAME="printethnicityline" -->
-			Ethnicity: <!-- TMPL_VAR NAME="ethnicity" -->, <!-- TMPL_VAR NAME="ethnotes" --><br>
+			<label class="label100">Ethnicity: </label><!-- TMPL_VAR NAME="ethnicity" -->, <!-- TMPL_VAR NAME="ethnotes" --><br>
 		<!-- /TMPL_IF -->
 		<!-- TMPL_UNLESS name="I" -->
-			DoB: <!-- TMPL_VAR NAME="dateofbirth" --><br>
-			Sex: <!-- TMPL_VAR NAME="sex" --><br>
+			<label class="label100">DoB: </label><!-- TMPL_VAR NAME="dateofbirth" --><br>
+			<label class="label100">Sex: </label><!-- TMPL_VAR NAME="sex" --><br>
 			Alternative
 		<!-- /TMPL_UNLESS -->
-		Contact: <!-- TMPL_VAR NAME="contactname" --><br>
-		Phone: <!-- TMPL_VAR NAME="altphone" --><br>
+		<label class="label100">Contact: </label><!-- TMPL_VAR NAME="contactname" --><br>
+		<label class="label100">Phone: </label><!-- TMPL_VAR NAME="altphone" --><br>
 		<!-- TMPL_UNLESS name="I" -->
-			Relationship: <!-- TMPL_VAR NAME="altrelationship" --><br>
+			<label class="label100">Relationship: </label><!-- TMPL_VAR NAME="altrelationship" --><br>
 		<!-- /TMPL_UNLESS -->
-		Notes: <!-- TMPL_VAR NAME="altnotes" -->
+		<label class="label100">Notes: </label><!-- TMPL_VAR NAME="altnotes" -->
 		<!-- TMPL_IF NAME="sort1" -->
-			<p>Sort field 1 : <!-- TMPL_VAR NAME="sort1" --></p>
+			<p><label class="label100">Sort field 1 : </label><!-- TMPL_VAR NAME="sort1" --></p>
 		<!-- /TMPL_IF -->
 		<!-- TMPL_IF NAME="sort2" -->
-			<p>Sort field 2 : <!-- TMPL_VAR NAME="sort2" --></p>
+			<p><label class="label100">Sort field 2 : </label><!-- TMPL_VAR NAME="sort2" --></p>
 		<!-- /TMPL_IF -->
 		</p>
 		<p>
@@ -56,42 +55,31 @@
 		<!-- /TMPL_UNLESS -->
 		</p>
 		<p>
-			General Notes: <!--<a href="popbox.html" onclick="messenger(200,250,'Form that lets you add to and delete notes.'); return false">-->
-			<!-- TMPL_VAR NAME="borrowernotes" --><!--</a>-->
+			<label class="label100">General Notes: </label>
+			<!-- TMPL_VAR NAME="borrowernotes" -->
 		</p>
-
-		<!-- TMPL_IF NAME="IS_ADULT" -->
-			
-			<form action="/cgi-bin/koha/members/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>
-			
-		<!-- /TMPL_IF -->
+		<p>
+			 <label class="label100">OPAC login : </label><!-- TMPL_VAR name="userid" -->
+			 <!-- TMPL_IF name="password" -->(password defined)<!-- TMPL_ELSE -->(no password)<!-- /TMPL_IF -->
+		</p>
+		<p>
 		<!-- TMPL_IF NAME="I" -->
-			<form action="/cgi-bin/koha/members/imemberentry.pl" method="post">
-				<input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->">
-				<input type="submit" class="button" value="Modify">
-			</form>
+			<a href="/cgi-bin/koha/members/imemberentry.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" class="button">Modify</a>
 		<!-- TMPL_ELSE -->
-			<form action="/cgi-bin/koha/members/memberentry.pl" method="post">
-				<input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->">
-				<input type="submit" class="button" name="modify" value="Modify">
-			</form>
+			<a href="/cgi-bin/koha/members/memberentry.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" class="button">Modify</a>
 		<!-- /TMPL_IF -->
-		<form action="javascript:confirm_deletion()">
-			<input type="hidden" name="member" value="<!-- TMPL_VAR NAME="bornum" -->">
-			<input type="submit" class="button" value="Delete">
-		</form>
-		<form action="/cgi-bin/koha/members/member-password.pl" method="post">
-			<input type="hidden" name="member" value="<!-- TMPL_VAR NAME="bornum" -->">
-			<input type="submit" class="button" value="Change Password">
-		</form>
-		<form action="/cgi-bin/koha/members/member-flags.pl" method="post">
-			<input type="hidden" name="member" value="<!-- TMPL_VAR NAME="bornum" -->">
-			<input type="submit" class="button" value="Modify User Flags">
-		</form>
+		<a href="javascript:confirm_deletion()" class="button">Delete</a>
+		<a href="/cgi-bin/koha/circ/circulation.pl?findborrower=<!-- TMPL_VAR NAME="cardnumber" -->" class="button">Issue books</a>
+		<a href="/cgi-bin/koha/members/member-password.pl?member=<!-- TMPL_VAR NAME="bornum" -->" class="button">Change Password</a>
+		</p>
+		<br/>
+		<p>
+		<!-- TMPL_IF NAME="IS_ADULT" -->
+			<a href="/cgi-bin/koha/members/jmemberentry.pl?type=Add&bornum=<!-- TMPL_VAR NAME="borrowernumber" -->" class="button">Add Child</a>
+		<!-- /TMPL_IF -->
+		<a href="/cgi-bin/koha/members/member-flags.pl?member=<!-- TMPL_VAR NAME="bornum" -->" class="button">Modify User Flags</a>
+		<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;print=page" class="button">Print Page</a> <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;print=slip" class="button">Print Slip</a>
+		</p>
 	</div>
 	
 <!-- TMPL_IF NAME="flagged" -->	<div class="bloc25">
@@ -167,7 +155,7 @@
 		<a class="button" href="/cgi-bin/koha/readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">Reading Record</a>
 	</div>
 
-	<div id="bloc25">
+	<div class="bloc25">
 		<h2 class="members">Items currently on issue</h2>
 		<!-- TMPL_IF NAME="issueloop" -->
 			<form action="../renewscript.pl" method="post">
diff --git a/koha-tmpl/intranet-tmpl/default/en/members/readingrec.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/readingrec.tmpl
index b2af773d41..41f4f46efb 100644
--- a/koha-tmpl/intranet-tmpl/default/en/members/readingrec.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/readingrec.tmpl
@@ -28,8 +28,13 @@
 		</th>
 	</tr>
 	<!-- TMPL_LOOP NAME="loop_reading" -->
-	<tr>
-		<td><!-- TMPL_VAR NAME="biblionumber" -->
+	<!-- TMPL_IF NAME="toggle" -->
+		<tr class="hilighted">
+	<!-- TMPL_ELSE -->
+		<tr>
+	<!-- /TMPL_IF -->
+		<td>
+			<!-- TMPL_VAR NAME="biblionumber" -->
 			<!-- TMPL_VAR NAME="title" -->&nbsp;
 		</td>
 		<td>
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl
index 039bc45237..a22c3e7441 100644
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl
@@ -88,6 +88,7 @@
 	</tr>
 	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
 		<input type="hidden" name="op" value="delete_confirmed">
+		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR name="authtypecode" -->">
 		<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
 	<tr><td colspan="2" align="center">CONFIRM DELETION</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>
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl
index bf99238c07..112896cb5a 100644
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl
@@ -254,9 +254,7 @@
 				<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>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>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>
@@ -269,14 +267,12 @@
 				<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>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&amp;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&amp;categorycode=<!-- TMPL_VAR NAME="categorycode" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" border="0"></a></td>
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/issuingrules.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/issuingrules.tmpl
index 9421b337e8..ff2a80f6be 100644
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/issuingrules.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/issuingrules.tmpl
@@ -3,8 +3,8 @@
 	<h1 class="parameters">Defining issuing rule for <!-- TMPL_VAR NAME="branch" --></h1>
 	<div id="bloc25">
 		<h2 class="parameters">HINT for issues</h2>
-		<p>Each box needs to be filled in with issuelength,maxissues</p>
-		<p>eq 21,5 enables 5 issues for 21 days</p>
+		<p>Each box needs to be filled with issuelength, maxissues</p>
+		<p> - eg: 21,5 enables 21 day loan with 5 issues</p>
 		<h2 class="parameters">HINT for fines</h2>
 		<p>Each box needs to be filled in with fine,time to start charging,charging cycle</p>
 		<p>eg 1,7,7 = 1USD,EUR,etc fine, after 7 days, every 7 days</p>
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl
index 5af3a2c106..e41b7ed8e8 100644
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl
@@ -130,6 +130,7 @@ function Check(f) {
 	<tr>
 		<th class="parameters">Code</th>
 		<th class="parameters">Description</th>
+		<th class="parameters">not for loan</th>
 		<th class="parameters">Renewable</th>
 		<th class="parameters">Charge</th>
 		<th class="parameters">Edit</th>
@@ -139,13 +140,16 @@ function Check(f) {
 		<tr>
 			<td><!-- TMPL_VAR NAME="itemtype" --></td>
 			<td><!-- TMPL_VAR NAME="description" --></td>
-			<td><!-- TMPL_IF NAME="renewalsallowed" -->
-					<!-- TMPL_VAR name="renewalsallowed" --> time(s)
-				<!-- TMPL_ELSE -->
-					No
-				<!-- /TMPL_IF -->
+			<td><!-- TMPL_IF NAME="notforloan" -->Yes<!-- /TMPL_IF --></td>
+			<td><!-- TMPL_UNLESS name="notforloan" -->
+					<!-- TMPL_IF NAME="renewalsallowed" -->
+						<!-- TMPL_VAR name="renewalsallowed" --> time(s)
+					<!-- TMPL_ELSE -->
+						No
+					<!-- /TMPL_IF -->
+				<!-- /TMPL_UNLESS -->
 			</td>
-			<td><!-- TMPL_VAR NAME="rentalcharge" --></td>
+			<td><!-- TMPL_UNLESS name="notforloan" --><!-- TMPL_VAR NAME="rentalcharge" --><!-- /TMPL_UNLESS --></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>
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 763c4d3ed9..25f5256e96 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
@@ -15,7 +15,7 @@
 	<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
 	<table>
 	<!-- TMPL_LOOP NAME="loop" -->
-		<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
+		<tr>
 		<td>
 			<h2 class="parameters">Tag <!-- TMPL_VAR NAME="tagfield" -->, Subfield <!-- TMPL_VAR NAME="tagsubfield" --></h2>
 			<h3>MARC constraints</h3>
diff --git a/koha-tmpl/intranet-tmpl/default/en/search.marc/result.tmpl b/koha-tmpl/intranet-tmpl/default/en/search.marc/result.tmpl
index 0ace47c99b..e76b9961ec 100644
--- a/koha-tmpl/intranet-tmpl/default/en/search.marc/result.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/search.marc/result.tmpl
@@ -46,14 +46,18 @@
 									(<!-- TMPL_VAR NAME="itemcallnumber" -->)
 								<!-- /TMPL_IF -->
 							<!-- /TMPL_IF -->
+							<!-- TMPL_IF name="notforloan" -->
+								<i>(<!-- TMPL_VAR name="notforloan" -->)</i>
+							<!-- /TMPL_IF -->
 						</p>
 					<!-- /TMPL_LOOP -->
+					<!-- TMPL_IF name="onorder" --><p>On order</p><!-- /TMPL_IF -->
 				</td>
 				<td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->>
 					<!-- TMPL_UNLESS name="norequests" -->
 						<a class="button catalogue" href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">Request</a>
 					<!-- TMPL_ELSE -->
-						Not Reservable
+						<p>Not Reservable</p>
 					<!-- /TMPL_UNLESS -->
 				</td>
 			</tr>
diff --git a/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl b/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl
index 3dcfbc4486..0e030689dc 100644
--- a/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl
@@ -303,7 +303,7 @@
 				<option value="d"
 				SELECTED>local(municipal, etc.)</option>
 			<!-- TMPL_ELSE -->
-				<option value="d">local(municiapal, etc.)</option>
+				<option value="d">local(municipal, etc.)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8e" -->
 				<option value="e"
diff --git a/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl b/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl
index 17771c9e74..2e3fd46b02 100755
--- a/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl
@@ -218,7 +218,7 @@
 
 
 	<tr>
-		<td>Couleur</td>
+		<td>Couleur:</td>
 		<td>
 			<select name="f4" size="1">
 			<!-- TMPL_IF name="f4 " -->
@@ -341,7 +341,7 @@
 			<!-- TMPL_IF name="f5ah" -->
 				<option value="ah" SELECTED>Craie noire</option>
 			<!-- TMPL_ELSE -->
-				<option value="ah">Craie nore</option>
+				<option value="ah">Craie noire</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5ai" -->
@@ -540,7 +540,7 @@
 			<!-- TMPL_IF name="f6ah" -->
 				<option value="ah" SELECTED>Craie noire</option>
 			<!-- TMPL_ELSE -->
-				<option value="ah">Craie nore</option>
+				<option value="ah">Craie noire</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6ai" -->
@@ -740,7 +740,7 @@
 			<!-- TMPL_IF name="f7ah" -->
 				<option value="ah" SELECTED>Craie noire</option>
 			<!-- TMPL_ELSE -->
-				<option value="ah">Craie nore</option>
+				<option value="ah">Craie noire</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7ai" -->
diff --git a/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl b/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl
index 3a4aa8c039..c5b1cc4401 100755
--- a/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl
@@ -489,7 +489,7 @@
 			<!-- TMPL_IF name="f8h" -->
 				<option value="h" SELECTED>Renseignements techniques sur la musique</option>
 			<!-- TMPL_ELSE -->
-				<option value="h">Renseignement techniques sur la musique</option>
+				<option value="h">Renseignements techniques sur la musique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8i" -->
 				<option value="i" SELECTED>Renseignements historiques sur la musique</option>
@@ -497,7 +497,7 @@
 				<option value="i">Renseignements historiques sur la musique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8j" -->
-				<option value="j" SELECTED>Autres renseignements hitoriques</option>
+				<option value="j" SELECTED>Autres renseignements historiques</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">Autres renseignements historiques</option>
 			<!-- /TMPL_IF -->
@@ -575,7 +575,7 @@
 			<!-- TMPL_IF name="f9h" -->
 				<option value="h" SELECTED>Renseignements techniques sur la musique</option>
 			<!-- TMPL_ELSE -->
-				<option value="h">Renseignement techniques sur la musique</option>
+				<option value="h">Renseignements techniques sur la musique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9i" -->
 				<option value="i" SELECTED>Renseignements historiques sur la musique</option>
@@ -583,7 +583,7 @@
 				<option value="i">Renseignements historiques sur la musique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9j" -->
-				<option value="j" SELECTED>Autres renseignements hitoriques</option>
+				<option value="j" SELECTED>Autres renseignements historiques</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">Autres renseignements historiques</option>
 			<!-- /TMPL_IF -->
@@ -661,7 +661,7 @@
 			<!-- TMPL_IF name="f10h" -->
 				<option value="h" SELECTED>Renseignements techniques sur la musique</option>
 			<!-- TMPL_ELSE -->
-				<option value="h">Renseignement techniques sur la musique</option>
+				<option value="h">Renseignements techniques sur la musique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10i" -->
 				<option value="i" SELECTED>Renseignements historiques sur la musique</option>
@@ -669,7 +669,7 @@
 				<option value="i">Renseignements historiques sur la musique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10j" -->
-				<option value="j" SELECTED>Autres renseignements hitoriques</option>
+				<option value="j" SELECTED>Autres renseignements historiques</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">Autres renseignements historiques</option>
 			<!-- /TMPL_IF -->
@@ -747,7 +747,7 @@
 			<!-- TMPL_IF name="f11h" -->
 				<option value="h" SELECTED>Renseignements techniques sur la musique</option>
 			<!-- TMPL_ELSE -->
-				<option value="h">Renseignement techniques sur la musique</option>
+				<option value="h">Renseignements techniques sur la musique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11i" -->
 				<option value="i" SELECTED>Renseignements historiques sur la musique</option>
@@ -755,7 +755,7 @@
 				<option value="i">Renseignements historiques sur la musique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11j" -->
-				<option value="j" SELECTED>Autres renseignements hitoriques</option>
+				<option value="j" SELECTED>Autres renseignements historiques</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">Autres renseignements historiques</option>
 			<!-- /TMPL_IF -->
@@ -833,7 +833,7 @@
 			<!-- TMPL_IF name="f12h" -->
 				<option value="h" SELECTED>Renseignements techniques sur la musique</option>
 			<!-- TMPL_ELSE -->
-				<option value="h">Renseignement techniques sur la musique</option>
+				<option value="h">Renseignements techniques sur la musique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12i" -->
 				<option value="i" SELECTED>Renseignements historiques sur la musique</option>
@@ -841,7 +841,7 @@
 				<option value="i">Renseignements historiques sur la musique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12j" -->
-				<option value="j" SELECTED>Autres renseignements hitoriques</option>
+				<option value="j" SELECTED>Autres renseignements historiques</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">Autres renseignements historiques</option>
 			<!-- /TMPL_IF -->
@@ -919,7 +919,7 @@
 			<!-- TMPL_IF name="f13h" -->
 				<option value="h" SELECTED>Renseignements techniques sur la musique</option>
 			<!-- TMPL_ELSE -->
-				<option value="h">Renseignement techniques sur la musique</option>
+				<option value="h">Renseignements techniques sur la musique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13i" -->
 				<option value="i" SELECTED>Renseignements historiques sur la musique</option>
@@ -927,7 +927,7 @@
 				<option value="i">Renseignements historiques sur la musique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13j" -->
-				<option value="j" SELECTED>Autres renseignements hitoriques</option>
+				<option value="j" SELECTED>Autres renseignements historiques</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">Autres renseignements historiques</option>
 			<!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/about.tmpl b/koha-tmpl/intranet-tmpl/default/fr/about.tmpl
index b9ea0f8c4f..5a5ad2c3ff 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/about.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/about.tmpl
@@ -1,53 +1,55 @@
 <!-- TMPL_INCLUDE NAME="about-top.inc" -->
 
 <div id="mainbloc">
-	<!-- TMPL_VAR NAME="about" --> <h1>Informations sur la version actuelle de Koha pour le rapport de bogues (ou d'intérêt général).</h1>  \t 
+	<!-- TMPL_VAR NAME="about" --> <h1>Informations sur la version actuelle de Koha pour le rapport de bogues (ou d'intérêt général).</h1>  \t
 	<div id="bloc25">
 		<h2>Information serveur</h2>
 		<p><label class="label100">Version Koha</label><!-- TMPL_VAR ESCAPE=HTML name="kohaVersion" --></p>
 		<p><label class="label100">Version de l'OS ('uname -a) :</label><!-- TMPL_VAR ESCAPE=HTML name="osVersion" --></p>
 		<p><label class="label100">version PERL :</label><!-- TMPL_VAR ESCAPE=HTML name="perlVersion" --></p>
 		<p><label class="label100">Version MySQL</label><!-- TMPL_VAR ESCAPE=HTML name="mysqlVersion" --></p>
-		<p><label class="label100">Apache version</label><!-- TMPL_VAR ESCAPE=HTML name="apacheVersion" --></p>
+		<p><label class="label100">Version Apache</label><!-- TMPL_VAR ESCAPE=HTML name="apacheVersion" --></p>
 	</div>
 	<div id="bloc25">
 		<h2>Un merci particulier aux financeurs suivants</h2>
 		<p><b>Groupement de bibliothèques de Horowhenua</b> : Rosalie Blake, directrice des bibliothèques (Koha 1.0)</p>
-		<p>La <b>Bibliothèque Publique de Nelsonville</b> (support MARC)</p>
-		<p><b>EMN (Ecole des Mines de Nantes)</b> (Suggestion, stats modules and improved ldap support)</p>
-		<p><b>EMN (Ecole des Mines de Nantes)</b> (modules suggestion et stats, support ldap amélioré)</p>
+		<p>La<b>Bibliothèque Publique de Nelsonville</b>, USA, Ohio (financement support MARC)</p>
+		<p><b>EMN (Ecole des Mines de Nantes)</b>, France (Suggestion,module stats support LDAP amélioré)</p>
+		<p><b>ENSMP (Ecole Nationale Supérieure des Mines de Paris)</b> (grilles de catalogage multiples, autorités MARC, paniers OPAC, Support périodiques)</p>
 	</div>
 	<div id="bloc25">
 		<h2>Contributeurs principaux pour la version 2.2</h2>
 		<p><b>Rachel Hamilton-Williams</b>, Kaitiaki</p>
-		<p><b>Paul Poulain</b>, responsable de la version 2.2 (développeur MARC)</p>
-		<p>Stephen Hedges et La <b>Bibliothèque Publique de Nelsonville</b> (Financement du codage MARC)</p>
-		<p>Nicholas Rosasco,(rédacteur de la documentation)</p>
-		<p>Mike Hansen</p>
-		<p>MJ Ray et <b>Turo Technology LLP</b>, (contrôle qualité, installation et mise à jour, maintenance de la version 2.0)</p>
-		<p><b>Katipo Communications</b></p>
+		<p><b>Paul Poulain</b>, 2.2 release manager (MARC developer)</p>
+		<p>Stephen Hedges, Owen Leonard, Joshua Ferraro (<b>Nelsonville Public Library</b>)</p>
+		<p><b>Katipo Communications</b> (Koha 1.0 developers)</p>
 		<ul>
 			<p>Rachel Hamilton-Williams, General Manager (Webmistress)</p>
-			<p>Chris Cormack, 1.2 release manager</p>
+			<p>Chris Cormack, responsable de la version 1.2</p>
 			<p>et Simon Blake, Amanda Atkins, Operations Manager, Olwen Williams, Finlay Thompson,</p>
 			<p>Gynn Lomax, Richard Anderson, Jeremy Blake, Rebecca Holden, Olive T. Canine</p>
 		</ul>
+		<p>Emiliano Marmonti, Matías Veleda & Sebastian Catañeda <b>La Plata University, Argentina</b> (Impression codes-barres)</p>
+		<p>MJ Ray et <b>Turo Technology LLP</b>, (contrôle qualité, installation et mise à jour, maintenance de la version 2.0)</p>
+		<p>Nicholas Rosasco,(rédacteur de la documentation)</p>
+		<p>Mike Hansen</p>
+		<p><b>Pate Eyler</b> (Kaitiaki de 2002 à 2004)</p>
 	</div>
 	<div id="bloc25">
 	<h2>Merci à</h2>
 					<p>Adam Thick</p>
 					<p>Andrew Hooper</p>
 					<p>Al Banks</p>
-					<p>Ambrose Li (chinese & translation tool)</p>
-					<p>Andrew Arensburger (the small & great C4::Context module)</p>
+					<p>Ambrose Li (outil de traduction)</p>
+					<p>Andrew Arensburger (le petit et formidable Module C4::Contex.pm)</p>
 					<p>Benedykt P. Barszcz (Polonais pour version 2.0)</p>
 					<p>Brig C. McCoy</p>
 					<p>Daniel Holth</p>
 					<p>David Strainchamps</p>
-					<p>Dorian Meid (German translation)</p>
-					<p><b>doXulting</b> (Matthieu Branlat) panier OPAC</p>
-					<p>Ed Summers (Some code and Perl packages like MARC::Record)</p>
-					<p><b>Esiee</b> (Jérome Vizcaino, Michel Lerenard, Pierre Cauchois)</p>
+					<p>Dorian Meid (traduxtion allemande)</p>
+					<p>doXulting (Matthieu Branlat) panier OPAC</p>
+					<p>Ed Summers (Codes et paquetages Perl tels que Enregistrement::MARC)</p>
+					<p>Esiee (Jérome Vizcaino, Michel Lerenard, Pierre Cauchois)</p>
 					<p>Florian Bischof</p>
 					<p>Francisco M. Marzoa Alonso</p>
 					<p>Glen Stewart</p>
@@ -65,7 +67,15 @@
 					<p>Roger Buck</p>
 					<p>Ron Wickersham</p>
 					<p>Sebastiaan Durand</p>
-					<p><b>Steve Tonnesen</b> (préparation MARC, conception des Etagères virtuelles, KohaCD)</p>
+					<p>Steve Tonnesen (début MARC, concept d'étagères virtuelles, KohaCD)</p>
+					<p>Université ORT Uruguay (Ernesto Silva, Andres Tarallo)</p>
+	</div>
+	<div id="bloc25">
+	<h2>Traduction</h2>
+		<p><label>Français</label>Pascale Nalon (ENSMP) et Jean Yves Lemaire (Saint Germain sur Morin)</p>
+		<p><label>Chinois</label>Ambrose Li</p>
+		<p><label>Espagnol</label>Andes Tarallo</p>
+		<p><label>Italien</label>Giuseppe Angilella</p>
 	</div>
 </div>
 <!-- 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
index 2edc438020..427a1845c9 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/addbiblio-nomarc.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/addbiblio-nomarc.tmpl
@@ -28,7 +28,7 @@
 		<label class="label100">Date de copyright</label><input name="copyrightdate" size="40" /></p>
 		<label class="label100">Résumé:</label><textarea cols="30" rows="6" name="abstract"></textarea></p>
 		<label class="label100">Notes :</label><textarea cols="30" rows="6" name="notes"></textarea></p>
-		<p><input type="submit" value="Soumettre" class="button catalogue"></p>
+		<p><input type="submit" value="Valider" class="button catalogue"></p>
 		</form>
 		* Obligatoire
 	</div>
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 e12de57925..e74905052f 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/addbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/addbiblio.tmpl
@@ -11,7 +11,7 @@
 		<!-- TMPL_IF name="bibid" -->
 			<input type="button" value="Enregistrer" onclick="Check(this.form)" accesskey="w" class="button catalogue">
 		<!-- TMPL_ELSE -->
-			<input type="button" value="Ajouter une notice" onclick="Check(this.form)" accesskey="w" class="button catalogue">
+			<input type="button" value="Ajouter la notice" onclick="Check(this.form)" accesskey="w" class="button catalogue">
 		<!-- /TMPL_IF -->
 		<a href="javascript:PopupZ3950()" class="button catalogue">Recherche Z39.50</a>
 	</p>
@@ -68,7 +68,7 @@
 				<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" -->
 				<!-- TMPL_IF name="repeatable" -->
-					<a href="javascript:AddField(<!-- TMPL_VAR NAME="tag" -->)">+</a>
+					<a href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')">+</a>
 				<!-- /TMPL_IF -->
 				</p>
 			<!-- /TMPL_IF -->
@@ -99,7 +99,7 @@
 				<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" -->
 				<!-- TMPL_IF name="repeatable" -->
-					<a href="javascript:AddField(<!-- TMPL_VAR NAME="tag" -->)">+</a>
+					<a href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')">+</a>
 				<!-- /TMPL_IF -->
 				</p>
 			<!-- /TMPL_IF -->
@@ -130,7 +130,7 @@
 				<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" -->
 				<!-- TMPL_IF name="repeatable" -->
-					<a href="javascript:AddField(<!-- TMPL_VAR NAME="tag" -->)">+</a>
+					<a href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')">+</a>
 				<!-- /TMPL_IF -->
 				</p>
 			<!-- /TMPL_IF -->
@@ -161,7 +161,7 @@
 				<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" -->
 				<!-- TMPL_IF name="repeatable" -->
-					<a href="javascript:AddField(<!-- TMPL_VAR NAME="tag" -->)">+</a>
+					<a href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')">+</a>
 				<!-- /TMPL_IF -->
 				</p>
 			<!-- /TMPL_IF -->
@@ -192,7 +192,7 @@
 				<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" -->
 				<!-- TMPL_IF name="repeatable" -->
-					<a href="javascript:AddField(<!-- TMPL_VAR NAME="tag" -->)">+</a>
+					<a href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')">+</a>
 				<!-- /TMPL_IF -->
 				</p>
 			<!-- /TMPL_IF -->
@@ -223,7 +223,7 @@
 				<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" -->
 				<!-- TMPL_IF name="repeatable" -->
-					<a href="javascript:AddField(<!-- TMPL_VAR NAME="tag" -->)">+</a>
+					<a href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')">+</a>
 				<!-- /TMPL_IF -->
 				</p>
 			<!-- /TMPL_IF -->
@@ -254,7 +254,7 @@
 				<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" -->
 				<!-- TMPL_IF name="repeatable" -->
-					<a href="javascript:AddField(<!-- TMPL_VAR NAME="tag" -->)">+</a>
+					<a href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')">+</a>
 				<!-- /TMPL_IF -->
 				</p>
 			<!-- /TMPL_IF -->
@@ -285,7 +285,7 @@
 				<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" -->
 				<!-- TMPL_IF name="repeatable" -->
-					<a href="javascript:AddField(<!-- TMPL_VAR NAME="tag" -->)">+</a>
+					<a href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')">+</a>
 				<!-- /TMPL_IF -->
 				</p>
 			<!-- /TMPL_IF -->
@@ -316,7 +316,7 @@
 				<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" -->
 				<!-- TMPL_IF name="repeatable" -->
-					<a href="javascript:AddField(<!-- TMPL_VAR NAME="tag" -->)">+</a>
+					<a href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')">+</a>
 				<!-- /TMPL_IF -->
 				</p>
 			<!-- /TMPL_IF -->
@@ -347,7 +347,7 @@
 				<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" -->
 				<!-- TMPL_IF name="repeatable" -->
-					<a href="javascript:AddField(<!-- TMPL_VAR NAME="tag" -->)">+</a>
+					<a href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')">+</a>
 				<!-- /TMPL_IF -->
 				</p>
 			<!-- /TMPL_IF -->
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 09920d66e2..d702f25302 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/addbooks.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/addbooks.tmpl
@@ -13,7 +13,7 @@
 			<h2 class="catalogue">Pour ajouter une nouvelle notice/exemplaire, scannez ou entrez le code ISBN/ ISSN</h2>
 			<p><label class="label20">ISBN</label> <input type="text" name="isbn" /></p>
 			<p><label class="label20">Titre</label> <input type="text" name="title" /></p>
-			<p><input type="submit" value="Aller" class="button catalogue"></p>
+			<p><input type="submit" value="Lancer" class="button catalogue"></p>
 		</form>
 		<!-- TMPL_IF NAME="NOTMARC" -->
 			<p><a href="addbiblio-nomarc.pl" class="button catalogue">Créer une nouvelle notice</a></p>
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 81e31daac5..25128b23c9 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/additem.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/additem.tmpl
@@ -8,7 +8,7 @@
 		</h2>
 	<div id="bloc25">
 		<div name="10XX" id="10XX">
-		<h2 class="catalogue">Documents existants</h2>
+		<h2 class="catalogue">Exemplaires existants</h2>
 		<table>
 			<tr>
 				<!-- TMPL_LOOP NAME="item_header_loop" -->
@@ -48,7 +48,7 @@
 		<div id="problem"><b>ERREUR : Code à barres déjà utilisé!<b></div>
 	<!-- /TMPL_IF -->
 	<!-- TMPL_IF name="opisadd" -->
-	<input type="button" value="Ajouter un document" onclick="Check(this.form)" accesskey="w" class="button catalogue">
+	<input type="button" value="Ajouter un exemplaire" onclick="Check(this.form)" accesskey="w" class="button catalogue">
 	<!-- TMPL_ELSE -->
 	<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="itemtagfield" -->">
 	<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="itemtagsubfield" -->">
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 8d01711b89..1ed1bb7e9d 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/isbnsearch.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/isbnsearch.tmpl
@@ -14,12 +14,12 @@
 			<tr>
 				<th class="catalogue">Titre</th>
 				<th class="catalogue">Auteur</th>
-				<th class="catalogue">&copier;</th>
+				<th class="catalogue">&copy;</th>
 				<th class="catalogue">&nbsp;</th>
 			</tr>
 			<!-- TMPL_IF name="loop" -->
 			<!-- TMPL_LOOP NAME="loop" -->
-				<tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
+				<!-- TMPL_IF NAME="toggle" --><tr><!-- TMPL_ELSE --><tr class="hilighted"><!-- /TMPL_IF -->
 					<td><!-- TMPL_VAR NAME="title" --></a>
 					<td><!-- TMPL_VAR NAME="author" --></td>
 					<td><!-- TMPL_VAR NAME="copyrightdate" --></td>
@@ -72,7 +72,7 @@
 					<th>&nbsp;</th>
 				</tr>
 					<!-- TMPL_LOOP NAME="breeding_loop" -->
-						<tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
+				<!-- TMPL_IF NAME="toggle" --><tr><!-- TMPL_ELSE --><tr class="hilighted"><!-- /TMPL_IF -->
 							<td><!-- TMPL_VAR NAME="title" --></a>
 							<td><!-- TMPL_VAR NAME="author" --></td>
 							<td><!-- TMPL_VAR NAME="isbn" --></td>
@@ -80,7 +80,7 @@
 							<!-- TMPL_IF NAME="NOTMARC" -->
 							
 							<!-- TMPL_ELSE -->
-							<td><a href="addbiblio.pl?breedingid=<!-- TMPL_VAR NAME="id" -->">Ajouter une notice</a></td>
+							<td><a href="addbiblio.pl?breedingid=<!-- TMPL_VAR NAME="id" -->">Ajouter la notice</a></td>
 							<!-- /TMPL_IF -->
 						</tr>
 					<!-- /TMPL_LOOP -->
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 3d4d472c48..fa856c7112 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/acqui/acqui-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/acqui/acqui-home.tmpl
@@ -76,7 +76,7 @@
 		<p>Pour débuter une acquisition, que ça soit une commande, un achat direct ou un don, rechercher tout d'abord le fournisseur, Ajoutez en un si nécessaire.</p>
 		<p>Puis sélectionnez un panier d'achat précédent ou créez en un nouveau. Notez que le panier d'achat sera attaché à l'utilisateur sous lequel vous êtes loggé. </p>
 		<p>Pour commander un document vous avez besoin de déterminer si une notice existe déjà, puis soit ajouter un exemplaire, soit créer une nouvelle notice et y ajouter l'exemplaire</p>
-		<p>Pour fermer un panier de commande cliquez sur "voir les paniers de commande "ou cherchez en dessus, et cliquez alors sur "confirmer le panier".</p>
+		<p>Pour fermer un panier de commande cliquez sur "voir les paniers de commande "ou cherchez au dessus, et cliquez alors sur "valider le panier".</p>
 	</ul>
 </div>
 
diff --git a/koha-tmpl/intranet-tmpl/default/fr/acqui/acquire.tmpl b/koha-tmpl/intranet-tmpl/default/fr/acqui/acquire.tmpl
index cfc1f2af7d..c10ff8a124 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/acqui/acquire.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/acqui/acquire.tmpl
@@ -31,7 +31,7 @@
 				<!-- TMPL_VAR NAME="isbn" -->
 			</p>
 			<p>
-				<label class="label100">Périodique</label>
+				<label class="label100">Collections</label>
 				<!-- TMPL_VAR NAME="seriestitle" -->
 			</p>
 			<p>Entrer un(des) codes-barre et un site, si vous souhaitez ajouter un(des) exemplaires maintenant</p>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/acqui/histsearch.tmpl b/koha-tmpl/intranet-tmpl/default/fr/acqui/histsearch.tmpl
index fd8e3effd9..4db7b1e0e4 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/acqui/histsearch.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/acqui/histsearch.tmpl
@@ -10,6 +10,8 @@
 			<th class="acquisition">Prévu pour</th>
 			<th class="acquisition">Livré le</th>
 			<th class="acquisition">Quantité Commandée</th>
+			<th class="acquisition">Unit cost</th>
+			<th class="acquisition">&nbsp;</th>
 		</tr>
 		<tr>
 			<form>
@@ -34,6 +36,9 @@
 				<th class="acquisition">
 					&nbsp;
 				</th>
+				<th class="acquisition">
+					&nbsp;
+				</th>
 				<th class="acquisition">
 					<input type="submit" class="button acquisition" value="Filtrer">
 				</th>
@@ -62,6 +67,9 @@
 				<td>
 					<!-- TMPL_VAR name="quantity" -->
 				</td>
+				<td>
+					<!-- TMPL_VAR name="ecost" -->
+				</td>
 			</tr>
 		<!-- /TMPL_LOOP -->
 	</table>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/acqui/newbasket2.tmpl b/koha-tmpl/intranet-tmpl/default/fr/acqui/newbasket2.tmpl
index 43961acc13..b0485eb4f6 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/acqui/newbasket2.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/acqui/newbasket2.tmpl
@@ -28,7 +28,7 @@
 		<tr>
 			<th class="acquisition">TITRE</th>
 			<th class="acquisition">AUTEUR</th>
-			<th class="acquisition">&copier;</th>
+			<th class="acquisition">&copy;</th>
 			<th class="acquisition">TOTAL</th>
 			<th class="acquisition">EMPLACEMENT</th>
 		</tr>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/acqui/newbiblio.tmpl b/koha-tmpl/intranet-tmpl/default/fr/acqui/newbiblio.tmpl
index 8acef63be1..30ec4a0f27 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/acqui/newbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/acqui/newbiblio.tmpl
@@ -123,7 +123,7 @@ win.document.write("</font></body></html>");
 			<!-- /TMPL_IF -->
 		</p>
 		<p>
-			<label class="label100">Périodique</label>
+			<label class="label100">Collections</label>
 			<!-- TMPL_IF name="biblio" -->
 				<input type="hidden" size="20" name="series" value="<!-- TMPL_VAR NAME="seriestitle" -->"><!-- TMPL_VAR NAME="seriestitle" -->
 			<!-- TMPL_ELSE -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/authorities/authorities.tmpl b/koha-tmpl/intranet-tmpl/default/fr/authorities/authorities.tmpl
index cce16ae392..19dc387b04 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/authorities/authorities.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/authorities/authorities.tmpl
@@ -3,7 +3,7 @@
 
 <div class="tabbed">
 	<form method="post" name="f">
-	<h1 class="authority">autorité numéro <!-- TMPL_VAR NAME="authid" --></h1>
+	<h1 class="authority">Autorité numéro <!-- TMPL_VAR NAME="authid" --></h1>
 	<p>
 		<input type="hidden" name="op" value="add">
 		<input type="hidden" name="addfield_field">
@@ -12,7 +12,7 @@
 		<!-- TMPL_IF name="authid" -->
 			<input type="button" value="Enregistrer" onclick="Check(this.form)" accesskey="w" class="button authority">
 		<!-- TMPL_ELSE -->
-			<input type="button" value="Ajouter une autorité" onclick="Check(this.form)" accesskey="w" class="button authority">
+			<input type="button" value="Ajouter autorité" onclick="Check(this.form)" accesskey="w" class="button authority">
 		<!-- /TMPL_IF -->
 	</p>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/barcodes/barcodes-top.inc b/koha-tmpl/intranet-tmpl/default/fr/barcodes/barcodes-top.inc
index d3d94c07d7..c60b83d125 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/barcodes/barcodes-top.inc
+++ b/koha-tmpl/intranet-tmpl/default/fr/barcodes/barcodes-top.inc
@@ -207,7 +207,7 @@ function removeItem() {
 </div>
 <div id="submenu">
 	<span class="koha">options >></span>
-	<a href="/cgi-bin/koha/admin/aqbookfund.pl" class="submenu">Crédits</a> <a href="/cgi-bin/koha/admin/authorised_values.pl" class="submenu2"> Valeurs autorisées</a> <a href="/cgi-bin/koha/admin/thesaurus.pl" class="submenu">Thésaurus</a> <a href="/cgi-bin/koha/admin/currency.pl" class="submenu2">Devises</a> <a href="/cgi-bin/koha/admin/printers.pl" class="submenu">Imprimantes</a>
+	<a href="/cgi-bin/koha/admin/aqbookfund.pl" class="submenu">Crédits</a> <a href="/cgi-bin/koha/admin/authorised_values.pl" class="submenu2"> Valeurs autorisées</a> <a href="/cgi-bin/koha/admin/thesaurus.pl" class="submenu">Thésaurus</a> <a href="/cgi-bin/koha/admin/currency.pl" class="submenu2">Devises</ a> <a href="/cgi-bin/koha/admin/printers.pl" class="submenu">Imprimantes</a>
 </div>
 <!-- TMPL_IF NAME="loggedinusername" -->
     <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>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/barcodes/barcodes.tmpl b/koha-tmpl/intranet-tmpl/default/fr/barcodes/barcodes.tmpl
index e4eeebfb6b..1871432a6f 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/barcodes/barcodes.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/barcodes/barcodes.tmpl
@@ -1,182 +1,177 @@
-<!-- TMPL_INCLUDE NAME="barcodes-top.inc" -->
-
-<!-- ******************************************************************************************************** -->
-<!-- ******                             START OF ADD COUNTRY CODE PANEL                                ****** -->
-<!-- ******************************************************************************************************** -->
-
-<div class="countryPanel" style="position:absolute" id="addCountryCode">
- 	<form action="/cgi-bin/koha/barcodes/barcodes.pl" method="post" style="display:inline">
-		<input type="hidden" name="addCode" value="1">
-		<table style="background-color:#EFEFEF;border:1px" align="center">
-			<tr>
-				<th colspan="2">
-					Ajouter un code pays
-				</th>
-			</tr>
-			<tr>
-				<td>
-					Pays <input type="text" size="10" id="countryName" name="countryName"  
-					                        style="background-color:#FFFFFF;color:Black"/>
-				</td>
-				<td>
-					Code pays <input type="text" size="3" id="countryCode" name="countryCode"  
-					                        style="background-color:#FFFFFF;color:Black"/>
-				</td>
-			</tr>
-			<tr>
-				<td align="right">
-					<input type="submit" name="submit" id="submit" value="Enregistrer code">
-				</td>
-				<td align="left">
-					<input type="button" name="cancel" id="cancel" value="Annuler" onclick="javascript: document.getElementById('addCountryCode').style.display = 'none'">
-				</td>
-			</tr>
-		</table>
-	</form>
-</div>
-
-<!-- ******************************************************************************************************** -->
-<!-- ******                              END OF ADD COUNTRY CODE PANEL                                 ****** -->
-<!-- ******************************************************************************************************** -->
-
-<div id="mainbloc">
-	<h1>Générateur de code à barres</h1>
-	<table bgcolor="#ffcc00" width="80%" cellpadding="3">
-		<tr valign="center">
-			<td><font size="4">Générer le code à barres à partir du numéro d'inventaire</font></td>
-		</tr>
-	</table>
-	<ul>
-		<li>Sélectionnez une plage pour les numéros d'inventaire. Vous pouvez sélectionner une série continue ou une liste de codes disjoints</li>
-		<li>Sélectionner le style de modèle pour générer des codes à barres</li>
-		<li>Définissez la taille de la page pour le PDF</li>
-		<li>Koha va afficher la disposition , qui varie suivant la taille de la page, de tous les codes à barres.Vous pouvez définir à quel endroit l'impression commence.
-		</li>
-	</ul>
-	<br>
-	<form id="formulario" method="POST" action='<!-- TMPL_VAR NAME="SCRIPT_NAME" -->' name="form1"
-	      onsubmit="return checkFields(this);" target="_blank">
-		
-		<table cellpadding="3" border=0 class="myTable">
-			<!-- TMPL_IF NAME="ERROR" -->
-			<tr align="center">
-				<td colspan="2" >
-					<p style="font-size:13pt;color:red">Numéro d'inventaire introuvable dans ces limites. Merci de rééssayer</p>
-				</td>
-			</tr>
-			<!-- /TMPL_IF -->
-  			<tr valign="top">
-				<td align="right" style="width:50%;padding-right:20px"> 
-					<table style="border:0px">
-						<tr align="right">
-							<td>Type d'intervalle</td>
-						</tr>
-						<tr align="right">
-							<td><!-- TMPL_VAR NAME="RANGE_TYPE" --></td>
-						</tr>
-					</table>
-				</td>
-				<td style="width:50%;padding-left:20px"> 
-					<div id="continuous" class="panel" style="display:inline">
-						<table class="ranges">
-							<tr>
-					   			<td>De</td> 
-								<td><input id="from" type="text" name="from" size="20"></td>
-							</tr>
-							<tr>
-					   			<td>à :</td>
-								<td><input id="to" type="text" name="to" size="20"></td>
-							</tr>
-						</table>
-					</div> 
- 				    <div id="individuals" class="panel" style="display:none">
-						<table class="ranges">
-							<tr valign="top">
-								<td width="5%">
-									Numéro d'inventaire <BR>
-									<input id="inventaryCode" type="text" name="inventaryCode" size="20">
-								<td>
-								<td align="center">	
-									<img src="<!-- TMPL_VAR NAME="themelang" -->/images/rightarrow.png" onclick="addItem()"
-									     border="0" onclick="javascript: addItem();" style="cursor:pointer" style="display:table-cell">
-									<img src="<!-- TMPL_VAR NAME="themelang" -->/images/leftarrow.png" onclick="javascript: removeItem();" border="0" style="cursor:pointer" style="display:table-cell">
-								</td>
-								<td width="95%">		   
-									<select id='inventaryList' size='5' style="width:150px">
-									</select>
-									<input type="hidden" id='individualCodes' name="individualCodes">																						
-								</td>
-							</tr>
-						</table>	
-					</div>						
-				</td> <!-- Fin Rangos -->
-			</tr>
-			<tr> 
-				<td align="right" style="padding-right:20px">
-					<table style="border:0px">
-						<tr align="right">
-							<td>Code Pays</td>
-						</tr>
-						<tr align="right">
-							<td>
-								<div style="display:inline">
-									<img src="<!-- TMPL_VAR NAME="themelang" -->/images/more.gif" hspace="0" vspace="0" border="0" 
-									     style="vertical-align:bottom;cursor:pointer"
-									     onclick="javascript: addCountryCode()">
-									<!-- TMPL_VAR NAME="NUMBER_SYSTEM" -->
-								</div>
-							</td>
-						</tr>
-					</table>
-				</td>
-				<td style="padding-left:20px"> 
-					<table style="border:0px">
-						<tr>
-							<td>Taille</td>
-						</tr>
-						<tr>
-							<td>
-								<input type="text" name="pageType" readonly value="<!-- TMPL_VAR NAME="PAGES" -->"
-								       size="10"> <a href="/cgi-bin/koha/barcodes/printerConfig.pl">[Aller à la configuration de l'imprimante]</a>
-							</td>
-						</tr>
-					</table>
-				</td>
-			</tr>
-			<tr> 
-				<td align="right" style="padding-left:20px">Texte sous l'étiquette</td>
-				<td>
-					<input type="text" name="text_under_label" size="40" value="<!-- TMPL_VAR name="text_under_label -->"> Si ce champ est vide, l'auteur et le titre seront mis à la place
-				</td>
-			</tr>
-  			<tr valign="top">
-  			    <td colspan="2" align="center">
-			    	<table style='width:50%'>
-						<tr style="border-color:#000FCD">
-							<th colspan="<!-- TMPL_VAR NAME="COL_SPAN" -->">Numéro d'étiquette ou commencer l'impression</th>
-						</tr>
-						<!-- TMPL_LOOP NAME="LABEL_TABLE" -->
-							<tr style="align:left">
-								<!-- TMPL_LOOP NAME="columns" -->
-									<td style="border:1px solid #000000">
-										<input type="radio" id="label" value="<!-- TMPL_VAR NAME="tagname" -->"      
-										       name="label" <!-- TMPL_VAR NAME="check" -->> Etiquette <!-- TMPL_VAR NAME="labelname" -->
-									</td>
-								<!-- /TMPL_LOOP -->
-							</tr>
-						<!-- /TMPL_LOOP -->  			    
-					</table>
-				</td>
-  			</tr>
-  			<tr valign="top">
-  			    <td align="right">
-					<input type="submit" value="Générer les codes barres" name="B1" class="button">
-				</td>
-  			    <td align="left">
-  			    	<input type="reset" value="Effacer tous les champs" name="B2" class="button">
-				</td>
-  			</tr>
-		</table>		
-	</form>
-</div>
-<!-- TMPL_INCLUDE NAME="barcodes-bottom.inc" -->
+<!-- TMPL_INCLUDE NAME="barcodes-top.inc" -->
+
+<!-- ******************************************************************************************************** -->
+<!-- ******                             START OF ADD COUNTRY CODE PANEL                                ****** -->
+<!-- ******************************************************************************************************** -->
+
+<div class="countryPanel" style="position:absolute" id="addCountryCode">
+ 	<form action="/cgi-bin/koha/barcodes/barcodes.pl" method="post" style="display:inline">
+		<input type="hidden" name="addCode" value="1">
+		<table style="background-color:#EFEFEF;border:1px" align="center">
+			<tr>
+				<th colspan="2">
+					Ajouter un code pays
+				</th>
+			</tr>
+			<tr>
+				<td>
+					Pays <input type="text" size="10" id="countryName" name="countryName"  
+					                        style="background-color:#FFFFFF;color:Black"/>
+				</td>
+				<td>
+					Code pays <input type="text" size="3" id="countryCode" name="countryCode"  
+					                        style="background-color:#FFFFFF;color:Black"/>
+				</td>
+			</tr>
+			<tr>
+				<td align="right">
+					<input type="submit" name="submit" id="submit" value="Enregistrer code">
+				</td>
+				<td align="left">
+					<input type="button" name="cancel" id="cancel" value="Annuler" onclick="document.getElementById('addCountryCode').style.display = 'none'">
+				</td>
+			</tr>
+		</table>
+	</form>
+</div>
+
+<!-- ******************************************************************************************************** -->
+<!-- ******                              END OF ADD COUNTRY CODE PANEL                                 ****** -->
+<!-- ******************************************************************************************************** -->
+
+<div id="mainbloc">
+	<h1>Générateur de code à barres</h1>
+	<table bgcolor="#ffcc00" width="80%" cellpadding="3">
+		<tr valign="center">
+			<td><font size="4">Générer le code à barres à partir du numéro d'inventaire</font></td>
+		</tr>
+	</table>
+	<ul>
+		<li>Sélectionnez une plage pour les numéros d'inventaire. Vous pouvez sélectionner une série continue ou une liste de codes disjoints</li>
+		<li>Sélectionner le style de modèle pour générer des codes à barres</li>
+		<li>Définissez la taille de la page pour le PDF</li>
+		<li>Koha va afficher la disposition , qui varie suivant la taille de la page, de tous les codes à barres.Vous pouvez définir à quel endroit l'impression commence.
+		</li>
+	</ul>
+	<br>
+	<form id="formulario" method="POST" action="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->" name="form1" onsubmit="return checkFields(this);" target="_blank">
+		
+		<table cellpadding="3" border=0 class="myTable">
+			<!-- TMPL_IF NAME="ERROR" -->
+			<tr align="center">
+				<td colspan="2" >
+					<p style="font-size:13pt;color:red">Numéro d'inventaire introuvable dans ces limites. Merci de rééssayer</p>
+				</td>
+			</tr>
+			<!-- /TMPL_IF -->
+  			<tr valign="top">
+				<td align="right" style="width:50%;padding-right:20px"> 
+					<table style="border:0px">
+						<tr align="right">
+							<td>Type d'intervalle</td>
+						</tr>
+						<tr align="right">
+							<td><!-- TMPL_VAR NAME="RANGE_TYPE" --></td>
+						</tr>
+					</table>
+				</td>
+				<td style="width:50%;padding-left:20px"> 
+					<div id="continuous" class="panel" style="display:inline">
+						<table class="ranges">
+							<tr>
+					   			<td>De</td> 
+								<td><input id="from" type="text" name="from" size="20"></td>
+							</tr>
+							<tr>
+					   			<td>à :</td>
+								<td><input id="to" type="text" name="to" size="20"></td>
+							</tr>
+						</table>
+					</div> 
+ 				    <div id="individuals" class="panel" style="display:none">
+						<table class="ranges">
+							<tr valign="top">
+								<td width="5%">
+									Numéro d'inventaire <BR>
+									<input id="inventaryCode" type="text" name="inventaryCode" size="20">
+								<td>
+								<td align="center">	
+									<img src="<!-- TMPL_VAR NAME="themelang" -->/images/rightarrow.png" onclick="addItem()"
+									     border="0" onclick="javascript: addItem();" style="cursor:pointer" style="display:table-cell">
+									<img src="<!-- TMPL_VAR NAME="themelang" -->/images/leftarrow.png" onclick="javascript: removeItem();" border="0" style="cursor:pointer" style="display:table-cell">
+								</td>
+								<td width="95%">		   
+									<select id="inventaryList" size="5" style="width:150px">
+									</select>
+									<input type="hidden" id="individualCodes" name="individualCodes">																						
+								</td>
+							</tr>
+						</table>	
+					</div>						
+				</td> <!-- Fin Rangos -->
+			</tr>
+			<tr> 
+				<td align="right" style="padding-right:20px">
+					<table style="border:0px">
+						<tr align="right">
+							<td>Code Pays</td>
+						</tr>
+						<tr align="right">
+							<td>
+								<div style="display:inline">
+									<img src="<!-- TMPL_VAR NAME="themelang" -->/images/more.gif" hspace="0" vspace="0" border="0" style="vertical-align:bottom;cursor:pointer" onclick="addCountryCode();">
+									<!-- TMPL_VAR NAME="NUMBER_SYSTEM" -->
+								</div>
+							</td>
+						</tr>
+					</table>
+				</td>
+				<td style="padding-left:20px"> 
+					<table style="border:0px">
+						<tr>
+							<td>Taille</td>
+						</tr>
+						<tr>
+							<td>
+								<input type="text" name="pageType" readonly value="<!-- TMPL_VAR NAME="PAGES" -->"
+								       size="10"> <a href="/cgi-bin/koha/barcodes/printerConfig.pl">[Aller à la configuration de l'imprimante]</a>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr> 
+				<td align="right" style="padding-left:20px">Texte sous l'étiquette</td>
+				<td>
+					<input type="text" name="text_under_label" size="40" value="<!-- TMPL_VAR name="text_under_label -->"> Si ce champ est vide, l'auteur et le titre seront mis à la place
+				</td>
+			</tr>
+  			<tr valign="top">
+  			    <td colspan="2" align="center">
+			    	<table style="width:50%">
+						<tr style="border-color:#000FCD">
+							<th colspan="<!-- TMPL_VAR NAME="COL_SPAN" -->">Numéro d'étiquette ou commencer l'impression</th>
+						</tr>
+						<!-- TMPL_LOOP NAME="LABEL_TABLE" -->
+							<tr style="align:left">
+								<!-- TMPL_LOOP NAME="columns" -->
+									<td style="border:1px solid #000000">
+										<input type="radio" id="label" value="<!-- TMPL_VAR NAME="tagname" -->" name="label" <!-- TMPL_VAR NAME="check" -->> Etiquette <!-- TMPL_VAR NAME="labelname" --></td>
+								<!-- /TMPL_LOOP -->
+							</tr>
+						<!-- /TMPL_LOOP -->  			    
+					</table>
+				</td>
+  			</tr>
+  			<tr valign="top">
+  			    <td align="right">
+					<input type="submit" value="Générer les codes barres" name="B1" class="button">
+				</td>
+  			    <td align="left">
+  			    	<input type="reset" value="Effacer tous les champs" name="B2" class="button">
+				</td>
+  			</tr>
+		</table>		
+	</form>
+</div>
+<!-- TMPL_INCLUDE NAME="barcodes-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/bull/bull-home.tmpl b/koha-tmpl/intranet-tmpl/default/fr/bull/bull-home.tmpl
index c32e15e782..d222bdc278 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/bull/bull-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/bull/bull-home.tmpl
@@ -23,7 +23,7 @@
 		<!-- TMPL_LOOP name="subscriptions" -->
 			<tr>
 				<td>
-					<!-- TMPL_VAR name="title" -->
+					<!-- TMPL_VAR name="title" --> <!-- TMPL_IF name="notes" -->(<!-- TMPL_VAR name="notes" -->)<!-- /TMPL_IF -->
 				</td>
 				<td>
 					<!-- TMPL_VAR name="ISSN" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/bull/result.tmpl b/koha-tmpl/intranet-tmpl/default/fr/bull/result.tmpl
index 6d0fe28954..ae83c9f64c 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/bull/result.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/bull/result.tmpl
@@ -4,7 +4,7 @@
 	<div id="resultnumber">
 		<p>
 			<!-- 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>
+				<a href=subscription-bib-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 -->
@@ -12,11 +12,11 @@
 				<!-- 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>
+					<a href=subscription-bib-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>
+				<a href=subscription-bib-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 -->
 		</p>
 		<p>
@@ -47,7 +47,7 @@
 					</p>
 				</td>
 				<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
-						<a class="transparent" href="#" onclick="GetIt('<!-- TMPL_VAR NAME="biblionumber" -->','<!-- TMPL_VAR name="title" -->') ">Le choisir</a>
+						<a class="transparent" href="#" onclick="GetIt('<!-- TMPL_VAR NAME="biblionumber" -->','<!-- TMPL_VAR name="title" escape="URL" -->') ">Le choisir</a>
 				</td>
 			</tr>
 			<!-- /TMPL_LOOP -->
@@ -56,17 +56,17 @@
 	<div id="resultnumber">
 		<p>
 			<!-- 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>
+			<a href=subscription-bib-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>
+				<a href=subscription-bib-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>
+			<a href=subscription-bib-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 -->
 		</p>
 	</div>	
diff --git a/koha-tmpl/intranet-tmpl/default/fr/bull/search.tmpl b/koha-tmpl/intranet-tmpl/default/fr/bull/search.tmpl
index 69703f2bb3..5d23532657 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/bull/search.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/bull/search.tmpl
@@ -25,7 +25,7 @@
 				<option value="50">50</option>
 				<option value="100">100</option>
 			</select>
-		Commandé par
+		Trié par
 			<select name="orderby" size="1">
 				<option value="biblio.title">Titre</option>
 				<option value="biblio.author">Auteur</option>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/bull/subscription-add.tmpl b/koha-tmpl/intranet-tmpl/default/fr/bull/subscription-add.tmpl
index 22a77e4b2a..e45eedfce8 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/bull/subscription-add.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/bull/subscription-add.tmpl
@@ -89,7 +89,7 @@
 	</p>
 	<p><label class="label100">Arrive le</label>
 			<select name="dow" size="1">
-				<option value="">Sans</option>
+				<option value="">Aucun</option>
 				<!-- TMPL_IF name="dow1" -->
 					<option value="1" selected>Lundi</option>
 				<!-- TMPL_ELSE -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/bull/subscription-detail.tmpl b/koha-tmpl/intranet-tmpl/default/fr/bull/subscription-detail.tmpl
index 8cc7a5e574..41bda58b7f 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/bull/subscription-detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/bull/subscription-detail.tmpl
@@ -3,6 +3,9 @@
 <div id="mainbloc">
 <h1 class="bull">Abonnement</h1>
 <a href="subscription-add.pl?op=mod&subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="button bull">Editer</a> <a href="statecollection.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="button bull">Numéros</a> <a href="/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button bull">Notice</a>
+<!-- TMPL_UNLESS name="totalissues" -->
+	<a href="subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->&op=del" class="button bull">Supprimer l'abonnement</a>
+<!-- /TMPL_UNLESS -->
 <form method="post" name="f">
 <div id="bloc25">
 	<h2 class="bull">Information d'abonnement</h2>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/catalogue/MARCdetail.tmpl b/koha-tmpl/intranet-tmpl/default/fr/catalogue/MARCdetail.tmpl
index 1c4864d9e5..d0f9a03866 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/catalogue/MARCdetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/catalogue/MARCdetail.tmpl
@@ -3,9 +3,11 @@
 <!-- TMPL_UNLESS name="popup" -->
 	<div class="tabbed">
 		<h1 class="catalogue">Notice MARC : <!-- TMPL_VAR NAME="bibid" --></h1>
-		<a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue"> Editer notice </a> <a href="acqui.simple/additem.pl?bibid=<!-- TMPL_VAR name="bibid"-->" class="button catalogue"> Editer exemplaires </a> <a href="javascript:confirm_deletion()" class="button catalogue"> supprimer </a> <a href="detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue"> Normal </a> <a href="ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue"> ISBD </a> <a href="javascript:Dopop('bookshelves/addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue"> Ajouter dans étagère virtuelle </a> <a href="javascript:Dopop('detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue"> Imprimer </a>
-		<!-- TMPL_IF name="subscriptionid" -->
-		<a href="bull/subscription-detail.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->" class="button catalogue"> Abonnement </a> <a href="bull/serial-issues.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->" class="button catalogue" title="Serial issues"> Numéros </a>
+		<a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue"> Editer notice </a> <a href="acqui.simple/additem.pl?bibid=<!-- TMPL_VAR name="bibid"-->" class="button catalogue"> Editer exemplaires </a> <a href="javascript:confirm_deletion()" class="button catalogue"> Supprimer </a> <a href="detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue"> Normal </a> <a href="ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue"> ISBD </a> <a href="javascript:Dopop('bookshelves/addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue"> Ajouter dans étagère virtuelle </a> <a href="javascript:Dopop('detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue"> Imprimer </a>
+		<!-- TMPL_IF name="subscriptionsnumber" -->
+		<a href="bull-home.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
+			Abonnement(s)
+		</a>
 		<!-- /TMPL_IF -->
 		<!-- TMPL_IF NAME="norequests" -->
 		<!-- TMPL_ELSE -->
@@ -59,18 +61,18 @@
 			<!-- TMPL_LOOP NAME="subfield" -->
 				<p>
 					<label class="labelsubfield">
-					<!-- TMPL_IF name="link">
+					<!-- TMPL_IF name="link" -->
 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
 					<!-- TMPL_ELSE -->
 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
 					<!-- /TMPL_IF -->
-					<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
+					<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Rechercher à partir des valeurs de ces champs">
 					</a>
 					<!-- TMPL_VAR NAME="marc_subfield" -->
 					<!-- TMPL_VAR NAME="marc_lib" --></label>
 					<!-- TMPL_VAR NAME="marc_value" -->
 					<!-- TMPL_IF NAME="authority" -->
-						<a href="authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Auth</a>
+						<a href="authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Autorité</a>
 					<!-- /TMPL_IF -->
 				</p>
 			<!-- /TMPL_LOOP -->
@@ -89,7 +91,7 @@
 			<!-- TMPL_LOOP NAME="subfield" -->
 				<p>
 					<label class="labelsubfield">
-					<!-- TMPL_IF name="link">
+					<!-- TMPL_IF name="link" -->
 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
 					<!-- TMPL_ELSE -->
 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
@@ -119,18 +121,18 @@
 			<!-- TMPL_LOOP NAME="subfield" -->
 				<p>
 					<label class="labelsubfield">
-					<!-- TMPL_IF name="link">
+					<!-- TMPL_IF name="link" -->
 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
 					<!-- TMPL_ELSE -->
 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
 					<!-- /TMPL_IF -->
-					<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
+					<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Rechercher à partir des valeurs de ces champs">
 					</a>
 					<!-- TMPL_VAR NAME="marc_subfield" -->
 					<!-- TMPL_VAR NAME="marc_lib" --></label>
 					<!-- TMPL_VAR NAME="marc_value" -->
 					<!-- TMPL_IF NAME="authority" -->
-						<a href="authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Auth</a>
+						<a href="authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Autorité</a>
 					<!-- /TMPL_IF -->
 				</p>
 			<!-- /TMPL_LOOP -->
@@ -149,7 +151,7 @@
 			<!-- TMPL_LOOP NAME="subfield" -->
 				<p>
 					<label class="labelsubfield">
-					<!-- TMPL_IF name="link">
+					<!-- TMPL_IF name="link" -->
 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
 					<!-- TMPL_ELSE -->
 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
@@ -179,18 +181,18 @@
 			<!-- TMPL_LOOP NAME="subfield" -->
 				<p>
 					<label class="labelsubfield">
-					<!-- TMPL_IF name="link">
+					<!-- TMPL_IF name="link" -->
 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
 					<!-- TMPL_ELSE -->
 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
 					<!-- /TMPL_IF -->
-					<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
+					<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Rechercher à partir des valeurs de ces champs">
 					</a>
 					<!-- TMPL_VAR NAME="marc_subfield" -->
 					<!-- TMPL_VAR NAME="marc_lib" --></label>
 					<!-- TMPL_VAR NAME="marc_value" -->
 					<!-- TMPL_IF NAME="authority" -->
-						<a href="authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Auth</a>
+						<a href="authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Autorité</a>
 					<!-- /TMPL_IF -->
 				</p>
 			<!-- /TMPL_LOOP -->
@@ -209,7 +211,7 @@
 			<!-- TMPL_LOOP NAME="subfield" -->
 				<p>
 					<label class="labelsubfield">
-					<!-- TMPL_IF name="link">
+					<!-- TMPL_IF name="link" -->
 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
 					<!-- TMPL_ELSE -->
 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
@@ -239,18 +241,18 @@
 			<!-- TMPL_LOOP NAME="subfield" -->
 				<p>
 					<label class="labelsubfield">
-					<!-- TMPL_IF name="link">
+					<!-- TMPL_IF name="link" -->
 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
 					<!-- TMPL_ELSE -->
 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
 					<!-- /TMPL_IF -->
-					<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
+					<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Rechercher à partir des valeurs de ces champs">
 					</a>
 					<!-- TMPL_VAR NAME="marc_subfield" -->
 					<!-- TMPL_VAR NAME="marc_lib" --></label>
 					<!-- TMPL_VAR NAME="marc_value" -->
 					<!-- TMPL_IF NAME="authority" -->
-						<a href="authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Auth</a>
+						<a href="authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Autorité</a>
 					<!-- /TMPL_IF -->
 				</p>
 			<!-- /TMPL_LOOP -->
@@ -269,7 +271,7 @@
 			<!-- TMPL_LOOP NAME="subfield" -->
 				<p>
 					<label class="labelsubfield">
-					<!-- TMPL_IF name="link">
+					<!-- TMPL_IF name="link" -->
 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
 					<!-- TMPL_ELSE -->
 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
@@ -299,18 +301,18 @@
 			<!-- TMPL_LOOP NAME="subfield" -->
 				<p>
 					<label class="labelsubfield">
-					<!-- TMPL_IF name="link">
+					<!-- TMPL_IF name="link" -->
 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
 					<!-- TMPL_ELSE -->
 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
 					<!-- /TMPL_IF -->
-					<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
+					<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Rechercher à partir des valeurs de ces champs">
 					</a>
 					<!-- TMPL_VAR NAME="marc_subfield" -->
 					<!-- TMPL_VAR NAME="marc_lib" --></label>
 					<!-- TMPL_VAR NAME="marc_value" -->
 					<!-- TMPL_IF NAME="authority" -->
-						<a href="authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Auth</a>
+						<a href="authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Autorité</a>
 					<!-- /TMPL_IF -->
 				</p>
 			<!-- /TMPL_LOOP -->
@@ -329,7 +331,7 @@
 			<!-- TMPL_LOOP NAME="subfield" -->
 				<p>
 					<label class="labelsubfield">
-					<!-- TMPL_IF name="link">
+					<!-- TMPL_IF name="link" -->
 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
 					<!-- TMPL_ELSE -->
 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
diff --git a/koha-tmpl/intranet-tmpl/default/fr/catalogue/detail.tmpl b/koha-tmpl/intranet-tmpl/default/fr/catalogue/detail.tmpl
index f35982ebb7..e77353921d 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/catalogue/detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/catalogue/detail.tmpl
@@ -9,33 +9,55 @@
 		<a class="button catalogue" href="request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">Demandes</a>
 	<!-- /TMPL_IF -->
 	<div id="bloc25">
-		<h2 class="catalogue">NOTICE <!-- TMPL_VAR NAME="biblionumber" --></h2>
-		<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><br><!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="subtitle" --><b>Sous-Titre :</b> <!-- TMPL_VAR NAME="subtitle" --><br><!-- /TMPL_IF -->
-			<!-- 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><br><!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="additional" --><b>Auteur secondaire:</b> <!-- TMPL_VAR NAME="additional" --><br><!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="publishercode" --><b>Edité 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_VAR NAME="pages" --><!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="size" -->, <!-- TMPL_VAR NAME="size" --><br><!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="collection" --><b>Collection :</b> <!-- TMPL_VAR NAME="seriestitle" --><br><!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="subject" --><b>Sujet :</b> <!-- TMPL_VAR NAME="subject" --><br><!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="copyrightdate" --><b>Année :</b> <!-- TMPL_VAR NAME="copyrightdate" --><br><!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="notes" --><b>Remarques :</b> <!-- TMPL_VAR NAME="notes" --><br><!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="unititle" --><b>Titre uniforme:</b> <!-- TMPL_VAR NAME="unititle" --><br><!-- /TMPL_IF --> 
-			<!-- TMPL_IF NAME="serial" --><b>Périodique:</b> <!-- TMPL_VAR NAME="serial" --><br><!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="dewey" --><b>Dewey :</b> <a href="/cgi-bin/koha/opac-searchresults.pl?type=opac&amp;dewey=<!-- TMPL_VAR NAME="dewey" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="dewey" --></a><br><!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="classification" -->Classification : <!-- TMPL_VAR NAME="classification" --><br><!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="lccn" --><b>LCCN :</b> <!-- TMPL_VAR NAME="lccn" --><br><!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="url" --><b>URL:</b> <a href="<!-- TMPL_VAR NAME="url" -->"><!-- TMPL_VAR NAME="url" --></a><br><!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="subjects" --><b>Subjects:</b> <!-- TMPL_VAR NAME="subjects" --><br><!-- /TMPL_IF -->
-			<b>Nombre Total d'exemplaires :</b> <!-- TMPL_VAR NAME="count" -->
+	<table class="small">
+		<!-- BIBLIO RECORD TABLE -->
+		<tr>
+			<th class="catalogue">
+				<!-- TMPL_VAR NAME="title" --> enregistrement <!-- TMPL_VAR NAME="biblionumber" -->
+			</th>
+		</tr>
+		<tr>
+			<td>
+				<!-- TMPL_IF name="subtitles" -->
+					<label class="label100"><b>Subtitle(s):</b> </label>
+					<!-- TMPL_LOOP name="subtitles" -->
+						<!-- TMPL_VAR NAME="subtitle" --> ; 
+					<!-- /TMPL_LOOP -->
+					<br />
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF name="author" --><label class="label100"><b>Auteur:</b> </label><!-- TMPL_VAR NAME="author" --><br /><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="additional" --><label class="label100"><b>Additional Author:</b></label><!-- TMPL_VAR NAME="additional" --><br /><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="publishercode" --><label class="label100"><b>édité par :</b></label><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="publishercode" --><br />
+				<!-- TMPL_IF name="publicationyear" --><label class="label100"><b>S'inscrire </b></label><!-- /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" --><label class="label100"><b>ISBN :</b> </label><!-- TMPL_VAR NAME="isbn" --><br /><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="seriestitle" --><label class="label100"><b>Collection :</b> </label><!-- TMPL_VAR NAME="seriestitle" --><br /><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="subjects" --><label class="label100"><b>Sujet(s)</b> </label>
+					<!-- TMPL_LOOP name="subjects" -->
+						<a href="/cgi-bin/koha/opac-search.pl?op=do_search&marclist=bibliosubject.subject&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="subject" escape="HTML"-->"><!-- TMPL_VAR NAME="subject" --></a> <!-- /TMPL_LOOP -->
+					<br /><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="copyrightdate" --><label class="label100"><b>Année</b> </label><!-- TMPL_VAR NAME="copyrightdate" --><br /><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="notes" --><label class="label100"><b>Notes :</b> </label><!-- TMPL_VAR NAME="notes" --><br /><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="unititle" --><label class="label100"><b>Titre uniforme</b> </label><!-- TMPL_VAR NAME="unititle" --><br /><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="dewey" --><label class="label100"><b>Dewey :</b></label><!-- TMPL_VAR name="dewey" --><br /><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="url" --><label class="label100"><b>URL</b> </label><a href="<!-- TMPL_VAR name="url" -->"><!-- TMPL_VAR NAME="url" --></a><br /><!-- /TMPL_IF -->
+				<label class="label100"><b>Type de document </b></label>
+					<!-- TMPL_IF name="description" -->
+						<!-- TMPL_VAR name="description" -->
+					<!-- TMPL_ELSE -->
+						<!-- TMPL_VAR NAME="itemtype" -->
+					<!-- /TMPL_IF -->
+					<br/>
+				<b>Nombre Total d'exemplaires :</b> <!-- TMPL_VAR NAME="count" -->
+			</td>
+		</tr>
+	</table>
 	</div>
 <!-- /TMPL_LOOP -->
 <div id="bloc25">
 	<h2 class="catalogue">Exemplaires</h2>
-	<table>
+	<table class="small">
 		<tr>
 			<th class="catalogue">Type de document</th>
 			<th class="catalogue">Localisation</th>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/catalogue/searchresults.tmpl b/koha-tmpl/intranet-tmpl/default/fr/catalogue/searchresults.tmpl
index 8a7f7f2a02..95ae582c2f 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/catalogue/searchresults.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/catalogue/searchresults.tmpl
@@ -39,7 +39,7 @@
 <!-- TMPL_IF NAME="numrecords" -->
 <table>
 		<tr>
-	<th class="catalogue">Titre</th><th class="catalogue">Auteur</th><th class="catalogue">&copier;</th><th class="catalogue">Nombre d'exemplaires</th><th class="catalogue">Localisation</th><th class="catalogue">&nbsp;</th>
+	<th class="catalogue">Titre</th><th class="catalogue">Auteur</th><th class="catalogue">&copy;</th><th class="catalogue">Nombre d'exemplaires</th><th class="catalogue">Localisation</th><th class="catalogue">&nbsp;</th>
 	<!-- /TMPL_IF -->
 </tr>
 <!-- Actual Search Results -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/default/fr/circ/circulation.tmpl
index 5e002e5a22..5db171454b 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/circ/circulation.tmpl
@@ -29,8 +29,8 @@
 		<!-- TMPL_IF NAME="borrowernumber" -->
 			<h2 class="circulation">Information lecteur</h2>
 			<p>
-				<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->" onclick="openWindow(this,'Member', 480, 640)">
-					<!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" -->
+				<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" --> " onclick="openWindow(this,'Member', 480, 640)">
+					<!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> (<!-- TMPL_VAR name="cardnumber" -->)
 				</a>
 			</p>
 			<p>
@@ -42,7 +42,16 @@
 			<p>Catégorie : <!-- TMPL_VAR NAME="categorycode" --></p>
 			<p><!-- TMPL_VAR NAME="issuecount" --> Sorties<!-- TMPL_IF NAME="overduecount" -->,<!-- TMPL_VAR NAME="overduecount" --> En retard<!-- /TMPL_IF --></p>
 			<p><b><!-- TMPL_VAR NAME="borrowernotes" --></b></p>
-
+  			<!-- TMPL_IF NAME="dbarred" -->
+				<span class="error">Suspendu</span> Le lecteur est exclu 
+				<form action="/cgi-bin/koha/members/setdebar.pl" method="post">
+					<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
+					<input type="hidden" name="cardnumber" value="<!-- TMPL_VAR NAME="cardnumber" -->" />
+					<input type="hidden" value="circ" name="destination" />
+					<input type="hidden" name="status" value="0" />
+					<input type="submit" class="button circulation" value="Lift Debarment" />
+				</form>
+			<!-- /TMPL_IF -->
 		<!-- TMPL_ELSE -->
 				<h2 class="circulation">
 					entrer le n° de carte de lecteur ou une partie du nom
@@ -110,7 +119,7 @@
 				<option value="5"<!-- TMPL_IF NAME="month5" --> selected="selected"<!-- /TMPL_IF -->>Mai</option>
 				<option value="6"<!-- TMPL_IF NAME="month6" --> selected="selected"<!-- /TMPL_IF -->>Juin</option>
 				<option value="7"<!-- TMPL_IF NAME="month7" --> selected="selected"<!-- /TMPL_IF -->>Juil</option>
-				<option value="8"<!-- TMPL_IF NAME="month8" --> selected="selected"<!-- /TMPL_IF -->>Aoû</option>
+				<option value="8"<!-- TMPL_IF NAME="month8" --> selected="selected"<!-- /TMPL_IF -->>Aou</option>
 				<option value="9"<!-- TMPL_IF NAME="month9" --> selected="selected"<!-- /TMPL_IF -->>Sept</option>
 				<option value="10"<!-- TMPL_IF NAME="month10" --> selected="selected"<!-- /TMPL_IF -->>Oct</option>
 				<option value="11"<!-- TMPL_IF NAME="month11" --> selected="selected"<!-- /TMPL_IF -->>Nov</option>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/circ/selectbranchprinter.tmpl b/koha-tmpl/intranet-tmpl/default/fr/circ/selectbranchprinter.tmpl
index 366b058544..06d803344b 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/circ/selectbranchprinter.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/circ/selectbranchprinter.tmpl
@@ -29,7 +29,7 @@
 	</select>
 <!-- /TMPL_IF --></p>
 <p><input type="hidden" name="setcookies" value="1">
-<input value="Soumettre" type="changesettings" class="button"></p>
+<input value="Valider" type="changesettings" class="button"></p>
 </form>
 
 </div>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/errors/400.tmpl b/koha-tmpl/intranet-tmpl/default/fr/errors/400.tmpl
index 5a78ba2144..0879274ef8 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/errors/400.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/errors/400.tmpl
@@ -1,18 +1,11 @@
 <!-- TMPL_INCLUDE NAME="error-top.inc" -->
-<!--------------------------MAIN BODY OF PAGE-------------------------->
+<!-- ------------------------MAIN BODY OF PAGE------------------------ -->
 <div id="mainbloc">
-<h1>Erreur !!</h1>
+<h1>Une erreur s'est produite</h1>
+<h2>Erreur 404</h2>
 <ul>
-
-
-
-<div align="center"><font color="black"><b>Erreur 404</b> </div></font>
-<br>
-<br>
-<br>
-<br>
-
 <li>Cette erreur signifie que le lien a été rompu et que la page n'existe plus</li>	
+<li>Pour rapporter cette erreur, vous pouvez <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">envoyer un mail à l'administrateur</a></li>
 <li>Utilisez la barre de menu principale pour naviguer à nouveau dans Koha.</li>
 </ul>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/errors/401.tmpl b/koha-tmpl/intranet-tmpl/default/fr/errors/401.tmpl
index ac04c61c32..2d8dc84ce6 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/errors/401.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/errors/401.tmpl
@@ -1,18 +1,11 @@
 <!-- TMPL_INCLUDE NAME="error-top.inc" -->
-<!--------------------------MAIN BODY OF PAGE-------------------------->
+<!-- ------------------------MAIN BODY OF PAGE------------------------ -->
 <div id="mainbloc">
-<h1>Erreur !!</h1>
+<h1>Une erreur s'est produite</h1>
+<h2>Erreur 401</h2>
 <ul>
-
-
-
-<div align="center"><font color="black"><b>Erreur 401</b> </div></font>
-<br>
-<br>
-<br>
-<br>
-
 <li>Cette erreur signifie que vous n'êtes pas autorisé à visualiser cette page</li>	
+<li>Pour rapporter cette erreur, vous pouvez <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">envoyer un mail à l'administrateur</a></li>
 <li>Utilisez la barre de menu principale pour naviguer à nouveau dans Koha.</li>
 </ul>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/errors/402.tmpl b/koha-tmpl/intranet-tmpl/default/fr/errors/402.tmpl
index 5a78ba2144..0879274ef8 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/errors/402.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/errors/402.tmpl
@@ -1,18 +1,11 @@
 <!-- TMPL_INCLUDE NAME="error-top.inc" -->
-<!--------------------------MAIN BODY OF PAGE-------------------------->
+<!-- ------------------------MAIN BODY OF PAGE------------------------ -->
 <div id="mainbloc">
-<h1>Erreur !!</h1>
+<h1>Une erreur s'est produite</h1>
+<h2>Erreur 404</h2>
 <ul>
-
-
-
-<div align="center"><font color="black"><b>Erreur 404</b> </div></font>
-<br>
-<br>
-<br>
-<br>
-
 <li>Cette erreur signifie que le lien a été rompu et que la page n'existe plus</li>	
+<li>Pour rapporter cette erreur, vous pouvez <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">envoyer un mail à l'administrateur</a></li>
 <li>Utilisez la barre de menu principale pour naviguer à nouveau dans Koha.</li>
 </ul>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/errors/403.tmpl b/koha-tmpl/intranet-tmpl/default/fr/errors/403.tmpl
index 5a78ba2144..0879274ef8 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/errors/403.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/errors/403.tmpl
@@ -1,18 +1,11 @@
 <!-- TMPL_INCLUDE NAME="error-top.inc" -->
-<!--------------------------MAIN BODY OF PAGE-------------------------->
+<!-- ------------------------MAIN BODY OF PAGE------------------------ -->
 <div id="mainbloc">
-<h1>Erreur !!</h1>
+<h1>Une erreur s'est produite</h1>
+<h2>Erreur 404</h2>
 <ul>
-
-
-
-<div align="center"><font color="black"><b>Erreur 404</b> </div></font>
-<br>
-<br>
-<br>
-<br>
-
 <li>Cette erreur signifie que le lien a été rompu et que la page n'existe plus</li>	
+<li>Pour rapporter cette erreur, vous pouvez <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">envoyer un mail à l'administrateur</a></li>
 <li>Utilisez la barre de menu principale pour naviguer à nouveau dans Koha.</li>
 </ul>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/errors/404.tmpl b/koha-tmpl/intranet-tmpl/default/fr/errors/404.tmpl
index 5a78ba2144..0879274ef8 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/errors/404.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/errors/404.tmpl
@@ -1,18 +1,11 @@
 <!-- TMPL_INCLUDE NAME="error-top.inc" -->
-<!--------------------------MAIN BODY OF PAGE-------------------------->
+<!-- ------------------------MAIN BODY OF PAGE------------------------ -->
 <div id="mainbloc">
-<h1>Erreur !!</h1>
+<h1>Une erreur s'est produite</h1>
+<h2>Erreur 404</h2>
 <ul>
-
-
-
-<div align="center"><font color="black"><b>Erreur 404</b> </div></font>
-<br>
-<br>
-<br>
-<br>
-
 <li>Cette erreur signifie que le lien a été rompu et que la page n'existe plus</li>	
+<li>Pour rapporter cette erreur, vous pouvez <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">envoyer un mail à l'administrateur</a></li>
 <li>Utilisez la barre de menu principale pour naviguer à nouveau dans Koha.</li>
 </ul>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/errors/405.tmpl b/koha-tmpl/intranet-tmpl/default/fr/errors/405.tmpl
index 5a78ba2144..0879274ef8 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/errors/405.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/errors/405.tmpl
@@ -1,18 +1,11 @@
 <!-- TMPL_INCLUDE NAME="error-top.inc" -->
-<!--------------------------MAIN BODY OF PAGE-------------------------->
+<!-- ------------------------MAIN BODY OF PAGE------------------------ -->
 <div id="mainbloc">
-<h1>Erreur !!</h1>
+<h1>Une erreur s'est produite</h1>
+<h2>Erreur 404</h2>
 <ul>
-
-
-
-<div align="center"><font color="black"><b>Erreur 404</b> </div></font>
-<br>
-<br>
-<br>
-<br>
-
 <li>Cette erreur signifie que le lien a été rompu et que la page n'existe plus</li>	
+<li>Pour rapporter cette erreur, vous pouvez <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">envoyer un mail à l'administrateur</a></li>
 <li>Utilisez la barre de menu principale pour naviguer à nouveau dans Koha.</li>
 </ul>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/errors/500.tmpl b/koha-tmpl/intranet-tmpl/default/fr/errors/500.tmpl
index 7f5be162ec..e40ccb2173 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/errors/500.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/errors/500.tmpl
@@ -1,19 +1,12 @@
 <!-- TMPL_INCLUDE NAME="error-top.inc" -->
-<!--------------------------MAIN BODY OF PAGE-------------------------->
+<!-- ------------------------MAIN BODY OF PAGE------------------------ -->
 <div id="mainbloc">
-<h1>Erreur !!</h1>
-<ul>
-
-
-
-<div align="center"><font color="black"><b>Erreur 500</b> </div></font>
-<br>
-<br>
-<br>
-<br>
+<h1>Une erreur s'est produite</h1>
+<h2>Erreur 500</h2>
 
+<ul>
 <li>Dans Koha, ceci signifie normalement, que l'équipe de Koha travaille à de nouvelles options</li>	
-<li>Attendez une meilleure version ou envoyez un mail à la maintenance</li>
+<li>Attendes que la maintenance soit terminée, ou <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">envoyez un mail à l'administrateur Koha</a>.</li>
 <li>Utilisez la barre de menu principale pour naviguer à nouveau dans Koha.</li>
 </ul>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/export/marc.tmpl b/koha-tmpl/intranet-tmpl/default/fr/export/marc.tmpl
index d1ff62d1a0..d5e88efc44 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/export/marc.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/export/marc.tmpl
@@ -1,14 +1,16 @@
 <!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
 
-<center>
-<h1>Exportation de notice MARC</h1><br /><br /><br />
-Exporter au format MARC les notices suivantes :
-<form method="post">
-<p>de la notice : <input type="text" name="start_bib"> à  la notice : <input type="text" name="end_bib"></p>
-<input type="hidden" name="op" value="export">
-<input type="submit" value="Exportation">
-</form>
-
-<p>(laisser des blancs pour exporter toutes les notices)</p>
-<p>Remarque : les exemplaires NE SONT PAS exportés par cet outil</p>
+<div id="mainbloc">
+<h1>Exportation de notice MARC</h1>
+	<div id="bloc25">
+		<h2 class="parameters">Sélectionnez les notices à exporter :</h2>
+		<form method="post">
+			<p>de la notice : <input type="text" name="start_bib"> à  la notice : <input type="text" name="end_bib"></p>
+			<input type="hidden" name="op" value="export">
+			<p>(laisser des blancs pour exporter toutes les notices)</p>
+			<p>Remarque : les exemplaires NE SONT PAS exportés par cet outil</p>
+			<input type="submit" value="Exportation" class="button">
+		</form>
+	</div>
+</div>
 <!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/help/admin/aqbookfund.tmpl b/koha-tmpl/intranet-tmpl/default/fr/help/admin/aqbookfund.tmpl
index e83a4b4ca1..3f19885506 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/help/admin/aqbookfund.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/help/admin/aqbookfund.tmpl
@@ -2,14 +2,14 @@
 
 <h1>Gestion des lignes de crédit</h1>
 
-<p>La première fois que vous accéderez à cette page, on vous demandera d'ajouter votre prmeière ligne de crédit -- après quoi vous aurez aussi le choix d'éditer ou de détruire les lignes de crédit.</p>
+<p>La première fois que vous accéderez à cette page, on vous demandera d'ajouter votre première ligne de crédit -- après quoi vous aurez aussi le choix d'éditer ou de détruire les lignes de crédit.</p>
 
-<p>Les lignes de crédit peuvent être ignorées si vous avez réglé vos Préférences Système sur acquisitions "simple": les les lignes de crédit sont utiles uniquement quand vous utilisez les acquisitions "normal".</p><br>
+<p>Les lignes de crédit peuvent être ignorées si vous avez réglé vos Préférences Système sur acquisitions"simple":les lignes de crédit sont utiles uniquement quand vous utilisez les acquisitions "normal".</p><br>
 
 <p>Les "Budgets</p>
 
-<p>Chaque ligne de crédit un code unique, limité à cinq caractères, qui l'identifient.Vous devrez choisir vos codes (par exemple LIVRE, REVUE, BANQ, pour les lignes de crédit décrites ci-dessus), puis saisir ce code dans le champ "Code crédit", et le nom complet dans le champ "Nom".</p>
+<p>Chaque ligne de crédit a un code unique, limité à cinq caractères, qui l'identifie.Vous devrez choisir vos codes (par exemple LIVRE, REVUE, BANQ, pour les lignes de crédit décrites ci-dessus), puis saisir ce code dans le champ "Code crédit", et le nom complet dans le champ "Nom".</p>
 
-<p>Lorsque vous aurez créé une ligne de crédit, vous verrez un lien vers une page pour définir le budget de la ligne de crédit.Vous entrerez ici les dates de début et de fin de votre année budgétaire et le montant d'argent de cette ligne budgétaire spécifique.N'utilisez aucune sorte d'abréviation pour les devises (comme €) ou de virgule lorsque vous siassissez les chiffres. (Les virgules seront converties en chiffres décimaux).REMARQUE Vos dates ne seront pas sauvegardées correctement si vous n'avez pas choisi la forme des dates dans la section Préférences Système du module Paramètres--FAITES-LE AVANT de créer les budgets). </p>
+<p>Lorsque vous aurez créé une ligne de crédit, vous verrez un lien vers une page pour définir le budget de la ligne de crédit.Vous entrerez ici les dates de début et de fin de votre année budgétaire et le montant d'argent de cette ligne budgétaire spécifique.N'utilisez aucune sorte d'abréviation pour les devises (comme €) ou de virgule lorsque vous siassissez les chiffres. (Les virgules seront converties en chiffres décimaux).REMARQUE Vos dates ne seront pas sauvegardées correctement si vous n'avez pas choisi la forme des dates dans la section Préférences Système du module Paramètres--FAITES-LE AVANT de créer les budgets).</p>
 
 <!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/default/fr/help/admin/biblio_framework.tmpl b/koha-tmpl/intranet-tmpl/default/fr/help/admin/biblio_framework.tmpl
index 846d870efa..faae824cc9 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/help/admin/biblio_framework.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/help/admin/biblio_framework.tmpl
@@ -1,6 +1,6 @@
 <!-- TMPL_INCLUDE NAME="help-top.inc" -->
-	<h1>Grille de catalogage</h1>
+	<h1>Grilles de catalogage</h1>
 	<p>Les frameworks bibliographiques sont utilisés pour vos notices bibliographiques</p>
-	<p>Contrairement à Koha 2.0, dans cette version, vous pouvez avoir plus d'un framework pour cataloguer différents types de documents pouvez, par exemple, définir un framework pour les monographies, un pour les périodiques, un pour les URL...</p>
+	<p>Contrairement à Koha 2.0, dans cette version, vous pouvez avoir plus d'un framework pour cataloguer différents types de document.Vous pouvez, par exemple, définir une grille  pour les monographies, une pour les périodiques, une pour les URL...</p>
 	<p>Lorsqu'un framework est créé, vous pouvez cliquer sur structure MARC pour définir la structure MARC exacte. La première fois, Koha va vous demander de sélectionner un framework existant pour le copier dans le nouveau. Ainsi, vous n'aurez pas à re-définir toute la structure MARC</p>
 <!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/default/fr/help/admin/categorie.tmpl b/koha-tmpl/intranet-tmpl/default/fr/help/admin/categorie.tmpl
index 470e7d850d..4d69ebc3d0 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/help/admin/categorie.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/help/admin/categorie.tmpl
@@ -6,20 +6,20 @@
 <h2 class="help">Gestion des catégories</h2>
 <p>Commencez en attribuant un Code de Catégorie et une définition pour chaque type de lecteur.Le code est limité à deux caractères et peut être ce que vous voulez.Toutefois, quatre codes ont un sens particulier pour Koha :</p>
 <ul>
-	<li>"C"peut être utilisé pour les collectivités, telles que d'autres bibliothèques qui vous empruntent, auquel cas Koha demande une information lègèrement différente sur la collectivité;</li>
+	<li>"I"peut être utilisé pour les collectivités, telles que d'autres bibliothèques qui vous empruntent, dans ce cas Koha demande une information lègèrement différente sur la collectivité;</li>
 	<li>"A" (Adultes) and "W" peuvent être considérés comme des "garants" d'autres lecteurs qui dépendent d'eux.</li>
-	<li>"A"(Enfants) est une catégorie de lecteur qui a un "garant"</li>
+	<li>"C"(Enfants) est une catégorie de lecteur qui a un "garant"</li>
 </ul>
 
-<h2 class="help">Période d'inscription</h2>
+<h2 class="help">Durée d'inscription</h2>
 <p>La durée d'inscription est un nombre qui indique combien d'années l'inscription d'un lecteur est valide.Si vous considérez que les inscriptions doivent expirer au bout de 4 ans par exemple (comme dans une école, peut-être), fixez alors le nombre à 4. Si l'inscription n'expire jamais, fixer le sur un nombre anormalement élevé (99).</p>
 
-<h2 class="help">Upper Age Limit and Age Required</h2>
-<p>Upper Age Limit and Age Required set the age parameters for this type of user. If you issue children's cards to users between the ages of 2 and 18, for example, then Age Required would be "2" and Upper Age Limit would be "18." If there is no upper age limit, set this value to 99 (the highest allowed).</p>
+<h2 class="help">Limite d'âge supérieure</h2>
+<p>La limite d'âge supérieure et l'âge requis fixent les critères d'âge pour ce type de lecteur.Si vous délivrez des cartes enfants pour les lecteurs entre 2 et 18 ans, par exemple, alors l'âge requis sera"2" et la limite d'âge supérieure "18."S'il n'y a pas d'âge limite supérieure, fixez cette valeur à 99 (la plus grande valeur autorisée).</p>
 
-<h2 class="help">Enrollment Fee and Reserve Fee</h2>
+<h2 class="help">Droits d'inscription et frais de réservation</h2>
 <p>Les frais d'inscription et de réservation (s'il y en a)doivent être entrés soit comme des nombres entiers ou avec 6 décimales, sans indications de la devise (ex. "1,25000" au lieu de "1,25 €").</p>
 
-<h2 class="help">Avis de retard demandé</h2>
-<p>Overdue Notice Required lets you bypass generating overdue notices for this user type.</p>
+<h2 class="help">Note de retard demandée</h2>
+<p>Note de retard demandée vous permet de forcer les notes de retard affichées pour ce type d'usager.</p>
 <!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/default/fr/help/admin/checkmarc.tmpl b/koha-tmpl/intranet-tmpl/default/fr/help/admin/checkmarc.tmpl
index 96305c2b5e..c9ec3ece09 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/help/admin/checkmarc.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/help/admin/checkmarc.tmpl
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE name="help-top.inc" -->
 <p>Lorsque vous aurez terminé l'établissement de la structure des champs MARC (MarcTagstruct) et que vous aurez vérifié vos liens entre MARC et Koha (Koha2MarcLonks), cliquez sur le lien pour lancer un petit programme qui contrôlera les principales erreurs dans votre mise au point MARC.</p>
 
-<p>Ce contrôle MARC ne garantie pas que vous apprécierez les premiers résultats de vos efforts pour régler vos affichagesMARC, etc.--c'est une simple vérification des erreurs principales.Vous reverrez probablement votre paramétrage MARC plusieurs fois avant d'en être totalement satisfaits.Assurez-vous de lancer le contrôle MArc après chaque modification.</p>
+<p>Ce contrôle MARC ne garantie pas que vous apprécierez les premiers résultats de vos efforts pour régler vos affichagesMARC, etc.--c'est une simple vérification des erreurs principales.Vous reverrez probablement votre paramétrage MARC plusieurs fois avant d'en être totalement satisfaits. Assurez-vous de lancer le contrôle MArc après chaque modification.</p>
 <!-- TMPL_INCLUDE name="help-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/help/admin/currency.tmpl b/koha-tmpl/intranet-tmpl/default/fr/help/admin/currency.tmpl
index 074048b817..7522ee7b31 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/help/admin/currency.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/help/admin/currency.tmpl
@@ -1,6 +1,6 @@
 <!-- TMPL_INCLUDE name="help-top.inc" -->
 <h1>Gestion des devises</h1>
-<p>Définir les catégories de lecteurs</p>
+<p>Définir les devises que vous utilisez ici.</p>
 
 <p>Ici vous devez au moins indiquer votre devise nationale, en lui donnant un nom(comme US Dollar ou EURO) et en fixant le "taux"à 1.Si vous traitez avec des fournisseurs qui facturent dans une autre devise, entrez un nom pour cette devise (par exemple PESO) et fixez un taux de change approximatif par rapport à votre devise.(Remarque : les noms sont limités à 10 caractères ou moins.)le taux de change est utilisé pour calculer le solde de vos budgets d'acquisitions, lorsque vous acquérez des documents en utilisant les acquisitions "normal".</p>
 <!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/default/fr/help/admin/issuingrules.tmpl b/koha-tmpl/intranet-tmpl/default/fr/help/admin/issuingrules.tmpl
index 8797a9a05a..bb0f219769 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/help/admin/issuingrules.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/help/admin/issuingrules.tmpl
@@ -12,7 +12,7 @@
 <p>Les <b>*</b> ont un sens spécial.Ils signifient "tous".Si vous choississez 21,5 pour le type de document=*, Catégorie de lecteur=étudiant, Site=centrale, alors un étudiant ne pourra emprunter plus de cinq documents au total.Ce pavé "tous"se cumule avec les autres pavés.Cela veut dire qu'avec 21,5 pour le type de document=livre, 14,2 pour le type de document=CD et 30,6 pour le type de document=*(avec la catégorie de lecteur=étudiant), un étudiant pourra emprunter jusqu'à 5 livres, jusqu'à 2 CD, mais dans un maximum de 6 documents au total (livres et CD).Dans ce cas les"30 jours"pour le type de document=* est annulé et la durée du prêt est calculée pour chaque type de document</p>
 
 <h2>Amendes pour retard</h2>
-<p>Chaque pavé de la grille contient 3 nombres séparés par de virgules, définissants les amendes, à partir de combien de jours de retard une amende est exigible et une première réclamation préparée (le "délai de grâce"), et combien de jours après une nouvelle amende est-elle exigible et une seconde réclamation envoyée. Par exemple si vous pénalisez les adultes de 1 euro (ou dollar ou tout autre monnaie) pour les vidéos en retard de trois jours et que vous ajoutez un euro d'amende tous les cinq jours supplémentaires, entrez "1,3,5"dans le pavé en face de "Adulte" et de "Video."Si vous pénalisez les adultes de 25 centimes pour les livres de fiction à partir de 7 jours de retard et que vous renouvellez l'amende 7 jours plus tard, alors la saisie dans les pavés de grille correspondants sera".25,7,7".Lorsque le premier et le second dépassés sont envoyés, Koha prépare un "avertiseement"au bout du nombre de jours défini par le chiffre final dans la grille et fixe l'amende au maximum qui est de 5.</p>
+<p>Chaque pavé de la grille contient 3 nombres séparés par ded virgules, définissant les amendes, à partir de combien de jours de retard une amende est exigible et une première réclamation préparée (le "délai de grâce"), et combien de jours après une nouvelle amende est-elle exigible et une seconde réclamation envoyée. Par exemple si vous pénalisez les adultes de 1 euro (ou dollar ou tout autre monnaie) pour les vidéos en retard de trois jours et que vous ajoutez un euro d'amende tous les cinq jours supplémentaires, entrez "1,3,5"dans le pavé en face de "Adulte" et de "Video."Si vous pénalisez les adultes de 25 centimes pour les livres de fiction à partir de 7 jours de retard et que vous renouvellez l'amende 7 jours plus tard, alors la saisie dans les pavés de grille correspondants sera ".25,7,7".Lorsque le premier et le second dépassés sont envoyés, Koha prépare un "avertissement"au bout du nombre de jours défini par le chiffre final dans la grille et fixe l'amende au maximum qui est de 5.</p>
 
 <p>Demandez à votre administrateur d'ajouter ce script dans le planificateur de tâches (crontab), après minuit, pour que les amendes soient calculées chaque nuit</p>
 
diff --git a/koha-tmpl/intranet-tmpl/default/fr/help/admin/itemtypes.tmpl b/koha-tmpl/intranet-tmpl/default/fr/help/admin/itemtypes.tmpl
index 09e1f3da7e..a3abc69c49 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/help/admin/itemtypes.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/help/admin/itemtypes.tmpl
@@ -2,9 +2,9 @@
 <h1>Gestion des types de documents</h1>
 <p>Vous pouvez définir autant de types de document que vous souhaitez.</p>
 
-<p>Les types de document sont les "catégories" dans lesquelles vous répartisez vos documents.Par exemple, vous voulez probablement mettre les cassettes vidéo dans une catégorie différente des livres documentaires, et les policiers dans une catégorie différente de celle des livres d'images pour enfants.Si vous utilisez déjà un SIGB commercial, vous avez certainement déjà réparti vos collections dans de telles catégories.Maintenant vous devez indiquer à Koha quelles sont ces catégories.</p>
+<p>Les types de document sont les "catégories" dans lesquelles vous répartisez vos documents.Par exemple, vous voulez probablement mettre les cassettes vidéo dans une catégorie différente des livres documentaires, et les policiers dans une catégorie différente de celle des livres d'images pour enfants.Si vous utilisez déjà un SIGB commercial, vous avez certainement déjà réparti vos collections dans de telles catégories. Maintenant vous devez indiquer à Koha quelles sont ces catégories.</p>
 
-<p>Le code de type de document est limité à quatre caractères.Ce code est rarement affiché par Koha;Les utilisateurs verront à la palce la description du type de document.</p>
+<p>Le code de type de document est limité à quatre caractères.Ce code est rarement affiché par Koha;Les utilisateurs verront à la place la description du type de document.</p>
 
 <p>"Frais de prêt". C'est toute somme que vous pourriez demander aux lecteurs pour emprunter des ouvrages de certains types (tels que video).</p>
 
@@ -13,7 +13,7 @@
 <p>Les types de document sont utiles pour de nombreuses choses et <b>très</b> importants pour contrôler le fonctionnement de Koha :</p>
 <ul>
     <li>Les lecteurs peuvent chercher par types de document</li>
-    <li>Les règles dem prêt sont établies par type de documents (et par types de lecteurs / sites)</li>
+    <li>Les règles de prêt sont établies par types de document (et par types de lecteur / sites)</li>
 </ul>
 <p>Déterminer les types de document est l'une des premières choses que vous aurez à faire après l'installation du logiciel Koha.</p>
 <!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/default/fr/help/admin/koha2marclinks.tmpl b/koha-tmpl/intranet-tmpl/default/fr/help/admin/koha2marclinks.tmpl
index 5496932883..18d4acf3a8 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/help/admin/koha2marclinks.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/help/admin/koha2marclinks.tmpl
@@ -1,10 +1,10 @@
 <!-- TMPL_INCLUDE name="help-top.inc" -->
 <h1>Liens MARC %s</h1>
-<p>Cette page fournit une façon simplifiée pour lier vos champs et sous-champs MARC à la base non MARC de Koha, <b>pour la grille de catalogage par défaut<b>.On peut aussi le faire en même temps que l'on définit la structure des champs MARC, mais il est plus facile de voir les relations entre la base MARC et la base Koha, ici.</p>
+<p>Cette page fournit une méthode simplifiée pour lier vos champs et sous-champs MARC à la base non MARC de Koha, <b>pour la grille de catalogage par défaut<b>.On peut aussi le faire en même temps que l'on définit la structure des champs MARC, mais il est plus facile de voir les relations entre la base MARC et la base Koha, ici.</p>
 
-<p>Le menu déroulant liste les tables Koha qui peuvent recevoir des informations à partir enregistrements MARC.Les colonnes de chaque table sont listées en dessous du menu déroulant.</p>
+<p>Le menu déroulant liste les tables Koha qui peuvent recevoir des informations à partir d'enregistrements MARC.Les colonnes de chaque table sont listées en dessous du menu déroulant.</p>
 
-<p>Ne vous attendez pas à avoir chaque table de Koha reliée à un sous-champ MARC.Quelques unes (comme le numéro de notice, le numéro d'exemplaire) sont des valeurs générées par Koha et seront probablement automatiquement reliés.Les autres sont des messages qui sont activés lors du déroulement des activités de prêt normales et contiendront des informations qui ne font pas partie de votre notice MARC.</p>
+<p>Ne vous attendez pas à avoir chaque table de Koha reliée à un sous-champ MARC.Quelques unes (comme le numéro de notice, le numéro d'exemplaire) sont des valeurs générées par Koha et seront probablement automatiquement reliés. Les autres sont des messages qui sont activés lors du déroulement des activités de prêt normales et contiendront des informations qui ne font pas partie de votre notice MARC.</p>
 
 <p>C'est un lien terme-à-terme.Autrement dit un sous champ MARC ne peut être lié à une et une seule colonne d'une table Koha.</p>
 
diff --git a/koha-tmpl/intranet-tmpl/default/fr/help/admin/marc_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/default/fr/help/admin/marc_subfields_structure.tmpl
index 54351cff8c..30d8b4c4c9 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/help/admin/marc_subfields_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/help/admin/marc_subfields_structure.tmpl
@@ -1,25 +1,25 @@
 <!-- TMPL_INCLUDE name="help-top.inc" -->
 <h1>Gestion de la structure des champs MARC</h1>
 <p>Koha vous permet d'indiquer quels champs MARC vous voulez utiliser et ceux que vous voulez ignorer.Quand vous avez chargé et installé Koha, vous avez également obtenu la liste entière des champs UNIMARC et les sous-champs en usage actuellement.Maintenant vous devez utiliser la page de gestion pour éditer cette liste et dire à Koha quels champs vous voulez utiliser et comment vous voulez les utiliser.</p>
-<p>You can define as the marc tag structure for each biblio framework you have defined</p>
+<p>Vous pouvez définir la structure des champs Marc pour chaque grille de catalogage que vous avez spécifiée.</p>
 
 <p>Si vous êtes CERTAIN que vous n'utiliserez jamais un champ MARC alors vous pouvez le supprimer, mais puisque cela n'apportera pas d'amélioration notable à l'éxécution, c'est probablement mieux de la laisser.si vous utilisez d'anciens champs MARC qui ne sont plus dans la liste fournie avec Koha, alors utilisez la page de gestion de la structure MARC pour les ajouter. De même, vous aurez probablement besoin de d'ajouter le champ de possesseur que vous utilisez actuellement ou au moins contrôler la structure des sous-champs du champ 852 si vous l'utilisez pour les possesseurs.</p>
 
 <p>La préparation des sous-champs à partir de la structure des champs MARC prend beaucoup de temps, mais c'est aussi très important ; soyez sûr de cliquer sur le sous-champ lié à chaque champ de votre structure MARC</p>
 <p>Pour chaque sous-champ vous pouvez choisir :</p>
 <ul>
-<li>repeatable : wether it can be repeated or not. If it can be repeated, separate the values by a | in the MARC editor when you want to have the subfield twice</li>
+<li>répétable : peut être répété ou non.S'il est répétable, séparez les valeurs par un | dans l'éditeur MARC quand vous voulez doubler le sous-champ</li>
 <li>Obligatoire : si le champ est obligatoire ou non. S'il l'est, le catalogueur ne peut valider une notice si ce champ est vide.</li>
 <li>Chercher aussi : une liste de champs où Koha cherchera aussi quand on fera une recherche sur le sous-champ</li>
-<li>Lien Koha : <b>très important</b>. Koha est compatible multi-MARC.Ainsi, il ne sait pas ce que 245$a signifie, pas plus que 200$f (ces 2 champs étantle titre en MARC21 et en UNIMARC !).Ainsi dans cette liste vous pouvez "lier"un champ MARC à sa signification. Quand l'utilisateur veut chercher sur "titre", ce lien est utilisé pour savoir ce qui est cherché (245 si vous êtes en MARC21, 200 en UNIMARC).</li>
-<li>Texte pour les bibliothécaires :  c'est ce qui est affiché avant le sous-champ dans l'intranet</li>
+<li>Lien Koha : <b>très important</b>. Koha est compatible multi-MARC.Ainsi, il ne sait pas ce que 245$a signifie, pas plus que 200$f (ces 2 champs étantle titre en MARC21 et en UNIMARC !).Ainsi dans cette liste vous pouvez "lier "un champ MARC à sa signification. Quand l'utilisateur veut chercher sur "titre", ce lien est utilisé pour savoir ce qui est cherché (245 si vous êtes en MARC21, 200 en UNIMARC).</li>
+<li>Texte pour les bibliothécaires :  c'est ce qui est affiché avant le sous- champ dans l'intranet</li>
 <li>Texte pour l'OPAC : c'est ce qui apparaît avant le champ à l'OPAC.S'il est vide, c'est le texte pour les bibliothécaires qui est utilisé  à la place</li>
 <li>Géré dans l'onglet : indique l'onglet où le sous-champ est visible. Ignore signifie que le sous-champ n'est pas géré. Tous les sous-champs d'un champ donné doivent se trouver dans le même onglet ou être ignorés : premièrement c'est plus logique, deuxièment, Koha ne saurait plus trop répéter des champs répétables autrement!!!</li>
 <li>caché : signifie que le champ est géré, mais PAS affiché à l'opac.C'est en général pour les champs internes</li>
 <li>URL si coché, indique que le champ est une URL valide et peut-être cliquée</li>
 <li>Valeur autorisée : signifie que la valeur n'est pas libre, mais dans une liste de valeurs autorisées du genre sélectionné</li>
 <li>Liste d'autorité : signifie que la valeur n'est libre, mais doit être choisie dans la liste d'autorité de la catégorie choisie</li>
-<li>plugin : means the value is calculated or managed by a plugin. Plugins can do almost anything. For example, in UNIMARC there are plugins for every 1xx fields that are coded fields. The plugin is a huge help for cataloger ! There are also two plugins (unimarc_plugin_210c and unimarc_plugin_225a that can "magically" find the editor from an ISBN, and the collection list for the editor)</li>
+<li>module d'extension : signifie que la valeur est calculée ou gérée par un module d'extension.Par exemple, dans UNIMARC il y a des modules d'extension pour chaque champ 1xx, qui sont des champs codés.Le module d'extension est une aide considérable pour le catalogueur!</li>
 <li>La boucle est pour l'instant</li>
 </ul>
 <!-- TMPL_INCLUDE name="help-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/help/admin/marctagstructure.tmpl b/koha-tmpl/intranet-tmpl/default/fr/help/admin/marctagstructure.tmpl
index 54351cff8c..30d8b4c4c9 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/help/admin/marctagstructure.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/help/admin/marctagstructure.tmpl
@@ -1,25 +1,25 @@
 <!-- TMPL_INCLUDE name="help-top.inc" -->
 <h1>Gestion de la structure des champs MARC</h1>
 <p>Koha vous permet d'indiquer quels champs MARC vous voulez utiliser et ceux que vous voulez ignorer.Quand vous avez chargé et installé Koha, vous avez également obtenu la liste entière des champs UNIMARC et les sous-champs en usage actuellement.Maintenant vous devez utiliser la page de gestion pour éditer cette liste et dire à Koha quels champs vous voulez utiliser et comment vous voulez les utiliser.</p>
-<p>You can define as the marc tag structure for each biblio framework you have defined</p>
+<p>Vous pouvez définir la structure des champs Marc pour chaque grille de catalogage que vous avez spécifiée.</p>
 
 <p>Si vous êtes CERTAIN que vous n'utiliserez jamais un champ MARC alors vous pouvez le supprimer, mais puisque cela n'apportera pas d'amélioration notable à l'éxécution, c'est probablement mieux de la laisser.si vous utilisez d'anciens champs MARC qui ne sont plus dans la liste fournie avec Koha, alors utilisez la page de gestion de la structure MARC pour les ajouter. De même, vous aurez probablement besoin de d'ajouter le champ de possesseur que vous utilisez actuellement ou au moins contrôler la structure des sous-champs du champ 852 si vous l'utilisez pour les possesseurs.</p>
 
 <p>La préparation des sous-champs à partir de la structure des champs MARC prend beaucoup de temps, mais c'est aussi très important ; soyez sûr de cliquer sur le sous-champ lié à chaque champ de votre structure MARC</p>
 <p>Pour chaque sous-champ vous pouvez choisir :</p>
 <ul>
-<li>repeatable : wether it can be repeated or not. If it can be repeated, separate the values by a | in the MARC editor when you want to have the subfield twice</li>
+<li>répétable : peut être répété ou non.S'il est répétable, séparez les valeurs par un | dans l'éditeur MARC quand vous voulez doubler le sous-champ</li>
 <li>Obligatoire : si le champ est obligatoire ou non. S'il l'est, le catalogueur ne peut valider une notice si ce champ est vide.</li>
 <li>Chercher aussi : une liste de champs où Koha cherchera aussi quand on fera une recherche sur le sous-champ</li>
-<li>Lien Koha : <b>très important</b>. Koha est compatible multi-MARC.Ainsi, il ne sait pas ce que 245$a signifie, pas plus que 200$f (ces 2 champs étantle titre en MARC21 et en UNIMARC !).Ainsi dans cette liste vous pouvez "lier"un champ MARC à sa signification. Quand l'utilisateur veut chercher sur "titre", ce lien est utilisé pour savoir ce qui est cherché (245 si vous êtes en MARC21, 200 en UNIMARC).</li>
-<li>Texte pour les bibliothécaires :  c'est ce qui est affiché avant le sous-champ dans l'intranet</li>
+<li>Lien Koha : <b>très important</b>. Koha est compatible multi-MARC.Ainsi, il ne sait pas ce que 245$a signifie, pas plus que 200$f (ces 2 champs étantle titre en MARC21 et en UNIMARC !).Ainsi dans cette liste vous pouvez "lier "un champ MARC à sa signification. Quand l'utilisateur veut chercher sur "titre", ce lien est utilisé pour savoir ce qui est cherché (245 si vous êtes en MARC21, 200 en UNIMARC).</li>
+<li>Texte pour les bibliothécaires :  c'est ce qui est affiché avant le sous- champ dans l'intranet</li>
 <li>Texte pour l'OPAC : c'est ce qui apparaît avant le champ à l'OPAC.S'il est vide, c'est le texte pour les bibliothécaires qui est utilisé  à la place</li>
 <li>Géré dans l'onglet : indique l'onglet où le sous-champ est visible. Ignore signifie que le sous-champ n'est pas géré. Tous les sous-champs d'un champ donné doivent se trouver dans le même onglet ou être ignorés : premièrement c'est plus logique, deuxièment, Koha ne saurait plus trop répéter des champs répétables autrement!!!</li>
 <li>caché : signifie que le champ est géré, mais PAS affiché à l'opac.C'est en général pour les champs internes</li>
 <li>URL si coché, indique que le champ est une URL valide et peut-être cliquée</li>
 <li>Valeur autorisée : signifie que la valeur n'est pas libre, mais dans une liste de valeurs autorisées du genre sélectionné</li>
 <li>Liste d'autorité : signifie que la valeur n'est libre, mais doit être choisie dans la liste d'autorité de la catégorie choisie</li>
-<li>plugin : means the value is calculated or managed by a plugin. Plugins can do almost anything. For example, in UNIMARC there are plugins for every 1xx fields that are coded fields. The plugin is a huge help for cataloger ! There are also two plugins (unimarc_plugin_210c and unimarc_plugin_225a that can "magically" find the editor from an ISBN, and the collection list for the editor)</li>
+<li>module d'extension : signifie que la valeur est calculée ou gérée par un module d'extension.Par exemple, dans UNIMARC il y a des modules d'extension pour chaque champ 1xx, qui sont des champs codés.Le module d'extension est une aide considérable pour le catalogueur!</li>
 <li>La boucle est pour l'instant</li>
 </ul>
 <!-- TMPL_INCLUDE name="help-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/help/admin/systempreferences.tmpl b/koha-tmpl/intranet-tmpl/default/fr/help/admin/systempreferences.tmpl
index d63b990eb6..d968be088a 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/help/admin/systempreferences.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/help/admin/systempreferences.tmpl
@@ -1,18 +1,18 @@
 <!-- TMPL_INCLUDE name="help-top.inc" -->
 <h1>Gestion des préférences système</h1>
-<p>This page allows you to set the system preferences that control much of the basic behavior of Koha. These parameters should be set before any other parameters.</p>
+<p>Cette page vous permet de choisir les préférences système qui contrôlent la plupart des aspects de Koha.Ces paramètres devraient être fixés avant tous les autres.</p>
 <ul>
-<li><b>acquisitions --</b> Les choix sont "normal" ou "simple." "Normal"règle le système pour suivre les commandes et mettre à jour les informations sur les budgets et les fournisseurs lorsque vous ajoutez des exemplaires à votre collection."Simple"dit à Koha que vous allez ajouter des exemplaires à  votre collections sans suivi des commandes.</li>
+<li><b>acquisitions --</b> Les choix sont "normal" ou "simple." "Normal "règle le système pour suivre les commandes et mettre à jour les informations sur les budgets et les fournisseurs lorsque vous ajoutez des exemplaires à votre collection."Simple"dit à Koha que vous allez ajouter des exemplaires à  votre collections sans suivi des commandes.</li>
 
-<li><b>authoritysep --</b>Le séparateur utilisé dans le thésaurus des autorités.Habituellement "--".A éviter et inutile dans Koha 2.2</li>
+<li><b>authoritysep --</b>Le séparateur utilisé dans le thésaurus des autorités. Habituellement "--".A éviter et inutile dans Koha 2.2</li>
 
-<li><b>autoBarcode --</b> Le numéro de code à barres à affecter aux exemplaires est automatiquement défini (séquentiellement)par Koha si le choix est "oui" ("1"="oui").</li>
+<li><b>autoBarcode --</b> Le numéro de code à barres à affecter aux exemplaires est automatiquement défini (séquentiellement)par Koha si le choix est "oui " ("1"="oui").</li>
 
 <li><b>autoMemberNum --</b> Le numéro de lecteur (numéro de carte de lecteur) attribué au nouvel usager de la bibliothèque est automatiquement calculé par Koha si vous choisissez le "yes"("1"="yes")</li>
 
 <li><b>checkdigit --</b> Contrôles de validité sur le numéro de lecteur (Numéro de la carte d'emprunteur):rien ou contrôle de type"Katipo".Dans la plupart des cas vous choisirez "none"parce que vous utiliserez des codes à barres pré-imprimés</li>
 
-<li><b>dateformat --</b> Choisir le format de date "metric," "us," ou "iso"(us=mm/jj/aaaa, metric=jj/mm/aaaa, ISO=aaaa/mm/jj).Cela contrôle comment les dates sont affichées, mais pas comment elles sont stockées dans la base de données.</li>
+<li><b>dateformat --</b> Choisir le format de date "metric," "us," ou "iso "(us=mm/jj/aaaa, metric=jj/mm/aaaa, ISO=aaaa/mm/jj).Cela contrôle comment les dates sont affichées, mais pas comment elles sont stockées dans la base de données.</li>
 
 <li><b>tva --</b> "tva"est le taux de tva.Si vos lois sur les taxes exigent que vous payiez une taxe sur vos achats chez vos fournisseurs, entrez le taux de la taxe ici.Choisissez "0"si vous ne devez pas payé de taxe.</li>
 
@@ -20,27 +20,26 @@
 
 <li>
 	<p><b>ISBD --</b> Koha peut afficher les notices au format International Standard Bibliographic Description.La syntaxe de ce champ est franchement complexe : </p>
-	<p>it's divided into blocks, that can contain a text before, X fields, each having -or not- a string before, a string after, and a text after :</p>
-	<p><b>#995|<br>Items :|{\\n 995b}{ - 995j}{/995k}|</b></p>
-	<p>means the "block" 995 has &lt;br&gt;Items : BEFORE, then fields 995b, 995j and 995k, repeated for each item (995 is an UNIMARC standard), then nothing after the block.</p>
+	<p>c'est divisé en blocs, qui peuvent contenir un texte avant,  X champs,ayant- ou pas- une chaîne avant, une chaîne après, et un texte après :</p>
+	<p><b>#995|&lt;br&gt;Items :|{\\n995b}{ - 995j}{/995k}|</b></p>
+	<p>Signifie que le "bloc"995 a <br>Items :AVANT, les champs 995b, 995j, 995k, répétés pour chaque exemplaire, puis rien après le bloc.</p>
 	<p> Le # signifie "début d'un bloc", le | est le séparateur de chaque partie, les {} utilisées pour chaque sous-champ.Un champ peut avoir jusqu'à 3 indicateurs AVANT et jusqu'à 3 indicateurs APRES chaque sous-champ</p>
 	<p>La défintion UNIMARC (partielle) pour l'ISBD est </p><i>
-	<p>#700|<label>traducteur</label>|{700a}{701a}{702a}| ;
-		#200||{200a}{ [200b] }{. 200c}{ : 200e}{. 200h}{. 200i}{ / 200f}{ ; 200g}|<br/>
+	<p>#700|<label>traducteur</label>|{700a}{701a}{702a}| ; #200||{200a}{ [200b] }{. 200c}{ : 200e}{. 200h}{. 200i}{ / 200f}{ ; 200g}|<br/>
 		#230||{ ; 230a}|<br/>
 		#205||{ ; 205a}{ , 205b}{ = 205d}{ / 205f}{ ; 205g}|<br/>
 		#210|<br/><label>Editeur</label>|{ ; 210a}{ (210b) }{ : 210c}{, 210d}|<br/>
 		#210|(|{210e}{(210f)}{ : 210g}{, 210h}|)<br/>
-		#215|<br/><label> </label>|{ ; 215a}{ : 215c}{ ; 215d} { + 215e}|<br/>
+		#215|&lt;br/&gt;&lt;label&gt;&nbsp;&lt;/label&gt;|{ ; 215a}{ : 215c}{ ; 215d}{ + 215e}|<br/>
 		#225|<br/><label>Description</label>|{ (225a}{ = 225d}{ : 225e}{. 225h}{. 225i}{ / 225f}{, I225x}{ ; 225v}|)<br/>
-		#606|<br/><label>Sujets</label>|{ 606a - }|<br/>< br/><br/>
-		#995|<br>Exemplaires :|{\\n 995b}{ - 995j}{/995k}|<br/>
+		#606|&lt;br/&gt;&lt;label&gt;Sujets&lt;/label&gt;|{ 606a - }|&lt;br/&gt;&lt;br/&gt;<br/>
+		#995|&lt;br&gt;Exemplaires :|{\\n995b}{ - 995j}{/995k}|<br/>
 	</i></p>
 </li>
 
 <li><b>KohaAdminEmailAddress --</b>L'adresse électronique à laquelle les lecteurs enverront leurs demandes de modification de leurs documents enregistrés.</li>
 
-<li><b>ldapserver and ldapinfos --</b> Koha 2.0 sait utiliser un annuaire LDAP (Lightweight Directory Access Protocol,voir http://search.cpan.org/~gbarr/perl-ldap- 0.3202/lib/Net/LDAP.pod)pour gérer les accès des utilisateurs et leurs droits.Pour obtenir un paquetage Perl utilisable en bibliothèque sans ldap, tout ce qui est relié au LDAP a été déplacé dans KohaInstall/modules/C4/Auth_with_ldap.pm.Demandez à votre administrateur système de régler le LDAP avec Auth_with_ldap.pm (perldoc Auth_with_ldap. pm for help).Ces 2 paramétrages seront inutiles dans la 2.2 et ne devraient plus apparaïtre pour une nouvelle installation.</li>
+<li><b>ldapserver and ldapinfos --</b> Koha 2.0 sait utiliser un annuaire LDAP (Lightweight Directory Access Protocol,voir http://search.cpan.org/~gbarr/ perl-ldap- 0.3202/lib/Net/LDAP.pod)pour gérer les accès des utilisateurs et leurs droits.Pour obtenir un paquetage Perl utilisable en bibliothèque sans ldap, tout ce qui est relié au LDAP a été déplacé dans KohaInstall/modules/ C4/Auth_with_ldap.pm.Demandez à votre administrateur système de régler le LDAP avec Auth_with_ldap.pm (perldoc Auth_with_ldap. pm for help).Ces 2 paramétrages seront inutiles dans la 2.2 et ne devraient plus apparaïtre pour une nouvelle installation.</li>
 
 <li><b>Bibliothèque</b> Le nom de la bibliothèque ou le message qui s'affichera sur la page d'accueil de l'OPAC.Exemple : Bienvenu à <i>Koha<br/>SIGB sous licence libre</i></li>
 
@@ -56,7 +55,7 @@
 
 <li><b>opaclanguages --</b> Choisissez votre préférence de langue.(En dépit du nom, ce choix contrôle la langue utilisée pour tous les écrans de Koha, pas seulement pour l'OPAC).La langue au début de votre liste sera essayée d'abord</li>
 
-<li><b>opacthemes --</b> Règle l'ordre préféré pour les thèmes.Le premier thème sera essayé d'abord. </li>
+<li><b>opacthemes --</b> Règle l'ordre préféré pour les thèmes.Le premier thème sera essayé d'abord.</li>
 
 <li><b>printcirculationslips --</b> Des "bordereaux" de prêt sont imprimés sur votre imprimante de réception. Si 0 est choisi, les bordereaux ne sont pas imprimés.</li>
 
@@ -64,7 +63,7 @@
 
 <li><b>template --</b> Ordre de préférence des modèles d'écran.Koha propose plusieurs options différentes pour les modèles d'écran qui contrôlent l'aspect et la convivialité des écrans Koha, mais vous pouvez aussi écrire vos propres modèles.</li>
 
-<li><b>timeout --</b> </li>
+<li><b>timeout --</b></li>
 
 <li><b>virtualshelves --</b></li>
 <!-- TMPL_INCLUDE name="help-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/help/admin/z3950servers.tmpl b/koha-tmpl/intranet-tmpl/default/fr/help/admin/z3950servers.tmpl
index 8d5f20cf73..72542f8b99 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/help/admin/z3950servers.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/help/admin/z3950servers.tmpl
@@ -4,9 +4,9 @@
 
 <p>Koha est fourni avec un serveur Z3950 défini (La Bibliothèque du Congrès des Etat-Unis)pour chercher des notices de catalogage à importer directement dans votre catalogue.A cet endroit, vous pouvez indiquer d'autres serveurs pour la recherche.</p>
 
-<p>To add servers, you will need to know the domain name or IP address of the server, the port number to use, and the name of the database to access. This information is available for many servers worldwide by acessing the Index Data website at http://www.indexdata.dk/targettest/. All of the servers listed there accept anonymous connections. (Be sure to choose servers which deliver records in the proper MARC format for your Koha installation.)</p>
+<p>Pour ajouter des serveurs, vous aurez besoin de connaître le nom de domaine ou l'adresse IP du serveur, le numéro de port à utiliser, et le nom de la base de données à laquelle accéder.Cette information est disponible pour tous les serveurs du web en se connectant au site web de l'index des bases de données http://www.indexdata.dk/targettest/.Tous  les serveurs ici acceptent les connections anonymes.(Assurez-vous de choisir des serveurs qui fournissent des enregistrements au format MARC adapté avotre installation Koha).</p>
 
-<p>Si vous avez un nom d'ouverture de session, et un mot de passe pour d'autres serveurs z3950, Koha sauvera  votre identification d'utilisateur et mot de passe en plus des autres informations dont il a besoin pour se connecter.(Pour les serveurs anonymes, laissez les champs identifiant et  mot de passe en blanc.)Les autres champs du formulaire commandent si le serveur cherche automatiquement ou non quand vous lancer une requête z3950 (Mettre un "1"dans le champ "Checked" et l'ordre dans lequel il sera contrôlé.</p>
+<p>Si vous avez un nom d'ouverture de session, et un mot de passe pour d'autres serveurs z3950, Koha sauvera  votre identification d'utilisateur et mot de passe en plus des autres informations dont il a besoin pour se connecter. (Pour les serveurs anonymes, laissez les champs identifiant et  mot de passe en blanc.)Les autres champs du formulaire commandent si le serveur cherche automatiquement ou non quand vous lancer une requête z3950 (Mettre un "1 "dans le champ "Checked" et l'ordre dans lequel il sera contrôlé.</p>
 
 <p>C'est une bonne idée d'être sélectif dans le choix des serveurs.Définir plus de cinq ou six serveurs controlés pourrait retarder les résultats de votre recherche z3950, même s'ils sont interrogés en même temps.</p>
 
diff --git a/koha-tmpl/intranet-tmpl/default/fr/help/bull/statecollection.tmpl b/koha-tmpl/intranet-tmpl/default/fr/help/bull/statecollection.tmpl
index 291ce8735f..8d483dfe5f 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/help/bull/statecollection.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/help/bull/statecollection.tmpl
@@ -2,7 +2,7 @@
 	<h1>Abonnement Périodiques et résumé</h1>
 	<p>Cet écran est divisé en 2 parties</p>
 	<h2>La partie droite</h2>
-	<p>La partie droite concerne les parutions.Quand vous créer un nouvel abonnement, le 1er numéro est calculée automatiquement.Lorsque vous  voulez/ avez besoin,vous pouvez  définir les numeros qui ont un nouveau statut :</p>
+	<p>La partie droite concerne les parutions.Quand vous créez un nouvel abonnement, le 1er numéro est calculé automatiquement.Lorsque vous voulez/ avez besoin,vous pouvez définir les numeros qui ont un nouveau statut :</p>
 	<ul>
 		<li>Arrivé : lorqu'un bulletin arrive, vous pouvez le mettre en état"arrivé". Le bulletin disparait de la liste et le numéro est ajouté dans la liste des bulletins arrivés (à gauche)</li>
 		<li>En retard : signifie que le document est en retard et devrait être arrivé.Un numéro, qui noté à l'état en retard reste dans la liste des bulletins attendus et le  bulletin suivant attendu est généré</li>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/help/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/default/fr/help/circ/circulation.tmpl
index f17e9695f6..747dd7096b 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/help/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/help/circ/circulation.tmpl
@@ -2,10 +2,10 @@
 <h1>Prêt/Aide des sorties</h1>
 <p>Avant de commencer, il est très important que vous verifiez le site et l'imprimante choisis et que vous les changiez si nécessaire.Cela devra être fait seulement la première fois que vous ferez du prêt (ou des retours) à partir d'un poste de travail, ensuite un cookie du navigateur mémorisera le réglage correct.</p>
 
-<p>Maintenant commencez par scanner le code à barres du lecteur ou tapez son nom pour trouver leur compte.Lorsque Koha a trouvé un lecteur, vous verrez un nouveau pavé pour scanner ou taper le numéro identifiant le document (en général un code à barres).</p>
+<p>Maintenant commencez par scanner le code à barres du lecteur ou tapez son nom pour trouver son compte.Lorsque Koha a trouvé le lecteur, vous verrez un nouveau pavé pour scanner ou taper le numéro identifiant le document (en général un code à barres).</p>
 
 <p>Si vous souhaitez que ce document et les documents suivants de cette transaction aient une date de retour autre que la date par défaut définie pour ce type de document utilisez la "date de retour manuelle" pour choisir la date de retour avant de scanner le premier document.</p>
 
 <p>Si le prêt n'a rien de spécial, il sera fait immédiatement et affiché (avec les autres emprunts du lecteur)en bas de la page.</p>
-<p>Si le prêt pose problème, alors un autre pavé apparaîtra (en <b>ROUGE</b>) et vous demandera de confirmer que le prêt est possible.Si le prêt est vraiment impossible (par exemple le code à barres n'existe pas), alors vous ne pouvez pas le confirmer.Si le prêt est possible mais nécessite confirmation (comme pour un document prêté à un autre lecteur, ou un lecteur ayant emprunté trop de docuements), vous pourrz alors confirmer le prêt.Si la confirmation implique une autre opération (si le document est prêté à un autre lecteur, le prêté implique que le retour soir fait), alors elle sera aussi effectuée.</p>
+<p>Si le prêt pose problème, alors un autre pavé apparaîtra (en <b>ROUGE</b>) et vous demandera de confirmer que le prêt est possible.Si le prêt est vraiment impossible (par exemple le code à barres n'existe pas), alors vous ne pouvez pas le confirmer.Si le prêt est possible mais nécessite confirmation (comme pour un document prêté à un autre lecteur, ou un lecteur ayant emprunté trop de documents), vous pourrez alors confirmer le prêt.Si la confirmation implique une autre opération (si le document est prêté à un autre lecteur, le prêter implique que le retour soit fait), alors elle sera aussi effectuée.</p>
 <!-- TMPL_INCLUDE name="help-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/help/circ/returns.tmpl b/koha-tmpl/intranet-tmpl/default/fr/help/circ/returns.tmpl
index 35fb0283b4..be8e61284b 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/help/circ/returns.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/help/circ/returns.tmpl
@@ -1,9 +1,10 @@
 <!-- TMPL_INCLUDE name="help-top.inc" -->
+<h1>Prêt: Retours, aide en ligne</h1>
 <p>Avant de commencer, il est très important que vous verifiez le site et l'imprimante choisis et que vous les changiez si nécessaire. Cela devra être fait seulement la première fois que vous ferez du prêt (ou des retours) à partir d'un poste de travail, ensuite un cookie du navigateur mémorisera le réglage correct.</p>
 
 <p>Maintenant scannez simplement ou tapez le numéro identifiant du document (habituellement un code à barres)dans le pavé proposé.</p>
 
 <p>Le retour est fait et s'il y a quelque chose de particulier sur le document ou l'emprunteur (comme un emprunteur ayant des dettes), un pavé rouge vous en avertira</p>
-<p>Si le document a été réservé par quelqu'un d'autre, on vous demandera aussi de valider la réservation.Si vous la confirmez, le document est mis à l'état "en attente" et vous devrez avertir le lecteur que le docuement est disponible.</p>
+<p>Si le document a été réservé par quelqu'un d'autre, on vous demandera aussi de valider la réservation.Si vous la confirmez, le document est mis à l'état "en attente" et vous devrez avertir le lecteur que le document est disponible.</p>
 <p>Si le document est réservé par quelqu'un d'un autre site, vous devez aussi valider le transfert</p>
 <!-- TMPL_INCLUDE name="help-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/help/export/marc.tmpl b/koha-tmpl/intranet-tmpl/default/fr/help/export/marc.tmpl
index 84eee9d6de..d49ce1019f 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/help/export/marc.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/help/export/marc.tmpl
@@ -1,8 +1,8 @@
 <!-- TMPL_INCLUDE name="help-top.inc" -->
 <h1>export iso2709</h1>
-<p>This is a tool to export your bibliographic records in standard MARC communications format (ISO2709). It exports only the basic bibliographic information with no holdings information other than any holdings information originally loaded into Koha using the bulkmarcimport tool.</p>
+<p>Ceci est un outil pour exporter vos enregistrements bibliographiques au format standard d'échange MARC (ISO2709).Il exporte seulement les informations bibliographiques de base sans données exemplaires autres que toutes les données exemplaires chargées à l'origine dans Koha en utilisant l'outil "bulkmarcimport".</p>
 
-<p>You are asked to provide a starting biblio record number and an ending number for the export. If you want to export all of your records, leave the start and end numbers blank.</p>
+<p>On vous demande de fournir un numero d'enregistrement de début et de fin pour l'esportation.Si vous voulez exporter tous vos enregistrements, laissez les numeros de début et de fin en blanc.</p>
 
 <p>Les enregistrements sont chargés sur le poste de travail qui a demandé l'exportation et sont sauvés dans un fichier nommé "marc.pl."</p>
 <!-- TMPL_INCLUDE name="help-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/help/import/breeding.tmpl b/koha-tmpl/intranet-tmpl/default/fr/help/import/breeding.tmpl
index 01f5d8c2f7..3bba054ec3 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/help/import/breeding.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/help/import/breeding.tmpl
@@ -1,13 +1,13 @@
 <!-- TMPL_INCLUDE name="help-top.inc" -->
 <h1>Importer cette notice</h1>
-<p>This is one of the screens you will see frequently if you are starting from scratch.</p>
+<p>C'est un des écrans que vous verrez fréquemment si vous partez de zéro.</p>
 <p>C'est utile d'importer un paquet de notices iso2709 qui pourront être utilisées plus tard pour un catalogage rapide</p>
 <p>Au préalable, vous devez parcourir votre ordinateur pour trouver l'enregistrement MARC que vous avez sélectionné pour votre document.Cliquez</p>
 <p>Choisir le dossier à rechercher.</p>
 <p>Si vous n'êtes pas sûr d'avoir déjà importé un enregistrement laissez le button réglé sur</p>
 <p>Ignorer celui-ci, garder l'existant</p>
-<p>You can "name" the import to help you when you need to choose between more than 1 imported biblio (or just want to keep trace on where the biblios comes from)</p>
+<p>Vous pouvez donner un nom à l'importation pour vous aider quand vous devez choisir entre plusieurs notices importées (ou simplement pour garder la trace de la provenance des notices)</p>
 <p>Codage des caractères (MARC21 ou UNIMARC)</p>
-<p>You don't need to actually name every import, so you don't need to fill in this box if you don't want to. It is useful for telling imports apart if you've more than one of the same record.</p>
-<p><b>IMPORTANT : Cet outil n'est PAS prévu pour importer de l' iso2709 dans votre Base de Données ACTIVE.Si vous avez besoin de migrer des données à partir d'un autre SIGB, alors vous devez utiliser $kohaInstall/scripts/misc/bulkmarcimport.pl </b></p>
+<p>Vous n'avez pas vraiment besoin de donner un nom à chaque importation, ainsi vous n'êtes pas obligé de remplir le pavé si vous ne le souhaitez pas.C'est utile de donner un nom aux importations si vous avez plus d'une fois le même enregistrement.</p>
+<p><b>IMPORTANT : Cet outil n'est PAS prévu pour importer de l' iso2709 dans votre Base de Données ACTIVE.Si vous avez besoin de migrer des données à partir d'un autre SIGB, alors vous devez utiliser $kohaInstall/scripts/misc/ bulkmarcimport.pl</b></p>
 <!-- TMPL_INCLUDE name="help-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/help/search.marc/search.tmpl b/koha-tmpl/intranet-tmpl/default/fr/help/search.marc/search.tmpl
index c53bb94f65..05d85bd043 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/help/search.marc/search.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/help/search.marc/search.tmpl
@@ -1,15 +1,16 @@
 <!-- TMPL_INCLUDE NAME="help-top.inc" -->
 	<h1>Recherche</h1>
 	<p>La recherche est divisée en deux parties différentes :</p>
-	<h2>Champs usuels</h2>
-	<p>Les champs usuels sont dans la partie haute de l'écran. Ils contiennent :</p>
+	<h2>Champs courants</h2>
+	<p>Les champs courants sont en haut de l'écran.Ils comprennent :</p>
 		<ul>
 			<li>Tous les mots : recherche sur l'ensemble de la notice</li>
 			<li>Titre</li>
 			<li>Auteur</li>
 			<li>Code à Barres : le code à barres de la biblothèque pour le livre</li>
-			<li>Illustrateur</li>
 			<li>Dewey</li>
+			<li>Cote</li>
+			<li>ISBN</li>
 			<li>Type de document : sélectionnez ici un type de document. Si aucun n'est sélectionné, la recherche est lancée sur tous les types</li>
 			<li>Site : Sélectionnez un site précis.Si vous n'en sélectionnez aucun, la recherche se fera sur tous les sites</li>
 		</ul>
@@ -20,7 +21,7 @@
 			<li>Si vous saisissez un * (ou un %) à la fin d'un terme, Koha recherche les mots qui commencent par le terme saisi <b>inférieur*</b> signifie : trouver les notices qui ont un <b>titre contient un mot commençant par lower</b></li>
 		</ul>
 	<h2 class="catalogue">Recherche MARC</h2>
-	<p>Dans la partie inférieure de l'écran de recherche, le pavé <b>Plus de champs</b>, vous permet de saisir ce que vous voulez  :  et, ou, non (exclusions), recherche sur tous les champs/sous-champs MARC</p>
+	<p><b>Plus de champs</b>, vous permet de saisir ce que vous voulez : et, ou, non (exclusions), recherche sur tous les champs/sous-champs MARC'>En bas de l'écran de recherche, le pavé <b>Plus de champs</b>, vous permet de saisir ce que vous voulez : et, ou, non (exclusions), recherche sur tous les champs/sous-champs MARC</p>
 	
 	<p><b>REMARQUE IMPORTANTE : </b>Pour des raisons d'efficacité l'* est active uniquement si vous entrez un mot d'au moins 3 lettres.pour les mots  de  3 lettres ou moins, l'* est ignorée <b>ignoré</b></p>
 	<br/>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/includes/auth-top.inc b/koha-tmpl/intranet-tmpl/default/fr/includes/auth-top.inc
index 1a487a179a..239cdc7dec 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/includes/auth-top.inc
+++ b/koha-tmpl/intranet-tmpl/default/fr/includes/auth-top.inc
@@ -73,7 +73,7 @@ a.authority:hover {
 		<!-- /TMPL_LOOP -->
 	</select>
 	<a href="javascript:addauthority()" class="submenu2">
-		Ajouter une autorité
+		Ajouter autorité
 	</a>
 </div>
 </form>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/includes/bull-top.inc b/koha-tmpl/intranet-tmpl/default/fr/includes/bull-top.inc
index 9f52d71785..dbdcaa3ec2 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/includes/bull-top.inc
+++ b/koha-tmpl/intranet-tmpl/default/fr/includes/bull-top.inc
@@ -36,7 +36,7 @@ a.bull:hover {
 </div>
 <div id="submenu">
 	<span class="koha">options >></span>
-	<a href="/cgi-bin/koha/bull-home.pl" class="submenu"> Abonnement </a> <a href="/cgi-bin/koha/bull/lateissues.pl" class="submenu2"> Numéros </a>
+	<a href="/cgi-bin/koha/bull-home.pl" class="submenu"> Recherche Abonnement </a> <a href="/cgi-bin/koha/bull/lateissues.pl" class="submenu2"> Numéros en retard </a>
 </div>
 
 <!-- TMPL_IF NAME="loggedinusername" -->
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 27a0e10126..0313f935bf 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/includes/parameters-top.inc
+++ b/koha-tmpl/intranet-tmpl/default/fr/includes/parameters-top.inc
@@ -37,7 +37,7 @@ function Help() {
 </div>
 <div id="submenu">
 	<span class="koha">options >></span>
-	<a href="/cgi-bin/koha/admin/aqbookfund.pl" class="submenu">Crédits</a> <a href="/cgi-bin/koha/admin/authorised_values.pl" class="submenu2">Valeurs autorisées</a> <a href="/cgi-bin/koha/admin/currency.pl" class="submenu2">Devises</a> <a href="/cgi-bin/koha/admin/printers.pl" class="submenu">Imprimantes</a>
+	<a href="/cgi-bin/koha/admin/aqbookfund.pl" class="submenu">Crédits</a> <a href="/cgi-bin/koha/admin/authorised_values.pl" class="submenu2">Valeurs autorisées</a> <a href="/cgi-bin/koha/admin/currency.pl" class="submenu2">Devises</a> <a href="/cgi-bin/koha/admin/printers.pl" class="submenu">Imprimantes</ a>
 </div>
 <!-- TMPL_IF NAME="loggedinusername" -->
     <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>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/intranet-main.tmpl b/koha-tmpl/intranet-tmpl/default/fr/intranet-main.tmpl
index f7c11a1a98..8ea8e6039d 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/intranet-main.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/intranet-main.tmpl
@@ -74,7 +74,7 @@
 			<h1 class="catalogue">Catalogue</h1>
 			<a href="/cgi-bin/koha/loadmodules.pl?module=search&marc=1&amp;type=intranet" class="catalogue">Recherche catalogue</a>
 				<p>Rechercher une notice.Quand ce document est trouvé, vous pouvez vérifier son état, faire une réservation, ou bien voir où il se trouve</p>
-			<a href="/cgi-bin/koha/loadmodules.pl?module=addbiblio&amp;type=intranet" class="catalogue">Ajouter une notice</a>
+			<a href="/cgi-bin/koha/loadmodules.pl?module=addbiblio&amp;type=intranet" class="catalogue">Ajouter la notice</a>
 				<p>Ajouter directement une notice au catalogue de la bibliothèque</p>
 			<a class="catalogue" href="/cgi-bin/koha/bull-home.pl">Périodiques</a>
 				<p>Gestion des abonnements et des périodiques</p>
@@ -101,7 +101,7 @@
 				<img src="<!-- TMPL_VAR NAME="themelang" -->/images/holder.gif" width="1" height="12" alt="" hspace="0" vspace="0">
 			</form>
 
-			<a href="/cgi-bin/koha/members/members-home.pl" class="members">Domicile lecteur</a>
+			<a href="/cgi-bin/koha/members/members-home.pl" class="members">Accueil lecteur</a>
 			<p>Aller à la page principale des lecteurs</p>
 			<a href="/cgi-bin/koha/members/memberentry.pl?actionType=Add" class="members">Ajouter une inscription</a>
 			<p>Ajouter un lecteur à la bibliothèque.Le lecteur peut-être rattaché  à n'importe quel site de la bibliothèque.Il ou elle peut aussi avoir des enfants</p>
@@ -111,7 +111,7 @@
 		
 		<div id="Hint3" class="hint">
 			<h1 class="acquisition">Acquisitions</h1>
-			Commander des documents, recevoir des commandes, établir des budgets...
+			Commander des documents, receptionner des commandes, gérer des budgets...
 		</div>
 		<div id="Hint4" class="hint">
 			<h1 class="reports">Bilans</h1>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/members/member-flags.tmpl b/koha-tmpl/intranet-tmpl/default/fr/members/member-flags.tmpl
index a52adb7d92..515d5b9ec7 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/members/member-flags.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/members/member-flags.tmpl
@@ -12,7 +12,7 @@
 					<!-- TMPL_VAR NAME="flagdesc" -->
 				</p>
 			<!-- /TMPL_LOOP -->
-			<input type="submit" value="Définir les autorisations" class="button">
+			<input type="submit" value="Confirmer les autorisations" class="button">
 		</form>
 	</div>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/members/member.tmpl b/koha-tmpl/intranet-tmpl/default/fr/members/member.tmpl
index eca059d74e..bb1a7ab2fe 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/members/member.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/members/member.tmpl
@@ -5,7 +5,11 @@
 <div class="bloc100">
 	<div class="bloctitle">Rechercher sur</div>
 	<form action="/cgi-bin/koha/members/member.pl" method="post">
-		<input type="text" name="member" value="<!-- TMPL_VAR NAME="member" -->">
+		<input type="text" name="member" value="<!-- TMPL_VAR NAME="member" -->">  order by 
+		<select name="orderby">
+			<option value="surname,firstname">Nom de famille</option>
+			<option value="cardnumber">Cardnumber</option>
+		</select>
 		<input type="submit" class="button" value="OK">
 	</form>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/members/memberentry.tmpl b/koha-tmpl/intranet-tmpl/default/fr/members/memberentry.tmpl
index e9e2130deb..806db50999 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/members/memberentry.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/members/memberentry.tmpl
@@ -44,6 +44,7 @@
 		<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="actionType" value="<!-- TMPL_VAR NAME="actionType" -->">
 		<!-- TMPL_IF NAME="addAction" -->
 			<input type="hidden" name="op" value="add">
 		<!-- TMPL_ELSE -->
@@ -51,7 +52,7 @@
 		<!-- /TMPL_IF -->
 		<table>
 			<tr>
-				<td colspan="5">Lecteur# <!-- TMPL_VAR NAME="member" -->, Numéro de carte* <input type="text" name="cardnumber" size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->"></td>
+				<td colspan="5"><b>Member# <!-- TMPL_VAR NAME="member" -->, Card number*</b> <input type="text" name="cardnumber" size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->"></td>
 			</tr>
 			<tr>
 				<th colspan="5">NOUVEAU LECTEUR <!-- TMPL_UNLESS name="institution" -->DETAILS PERSONNELS<!-- /TMPL_UNLESS --> DETAILS DU CONTACT</th>
@@ -144,7 +145,7 @@
 
 			<tr>
 				<td  colspan="2"><b>Adresse Postale*</b></td>
-				<td><b>Code Postal</b></td>
+				<td>Code Postal</td>
 				<td><b> Ville*</b></td>
 				<td>Site d'inscription</td>
 			</tr>
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 d11e79170a..ed0f29fd49 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/members/members-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/members/members-home.tmpl
@@ -5,7 +5,11 @@
 <div id="bloc25">
 	<div class="bloctitle">Recherche de lecteur</div>
 	<form action="/cgi-bin/koha/members/member.pl" method="post">
-		<input type="text" size="50" name="member" >
+		<p><input type="text" size="30" name="member" >  order by 
+		<select name="orderby">
+			<option value="surname,firstname">Nom de famille</option>
+			<option value="cardnumber">Cardnumber</option>
+		</select>
 		<input type="submit" class="button" value="OK">
 		<p>Prolonger des prêts, visualiser,ajouter, modifier, supprimer des enregistrements,tout cela en commençant par cette recherche</p>
 		<p>Saisissez le nom du lecteur, une partie du nom, ou un code numérique dans le champ ci-dessus et appuyez sur la touche Entrée pour lancer la recherche</p>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/default/fr/members/moremember.tmpl
index 9fdf791cea..83b94a0dbd 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/members/moremember.tmpl
@@ -2,43 +2,42 @@
 
 <div id="mainbloc">
 	<h1><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h1>
-	<div id="bloc25">
-		<h2 class="members">Enregistrement de l'inscription</h2>
+	<div class="bloc25">
+		<h2 class="members">Description de l'inscription</h2>
 		<!-- 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>Numéro 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 domicile : <!-- TMPL_VAR NAME="physstreet" -->, <!-- TMPL_VAR NAME="homezipcode" --> <!-- TMPL_VAR NAME="streetcity" --><br>
-		Téléphone Domicile : <!-- TMPL_VAR NAME="phone" --><br><!-- /TMPL_UNLESS -->
-		Téléphone travail : <!-- TMPL_VAR NAME="phoneday" --><br>
-		Fax: <!-- TMPL_VAR NAME="faxnumber" --><br>
-		Mail : <a href="mailto:<!-- TMPL_VAR NAME="emailaddress" -->"><!-- TMPL_VAR NAME="emailaddress" --></a><br>
-		Texte de messagerie électronique: <!-- TMPL_VAR NAME="textmessaging" --><br>
-		Numéro d'inscription: <!-- TMPL_VAR NAME="borrowernumber" --><br>
-		Catégorie d'inscription: <!-- TMPL_VAR NAME="categorycode" --><br>
-		Droit d'inscription : 30 €/an, payé<br>
-		Inscription : <!-- TMPL_VAR NAME="dateenrolled" -->, Se termine : <!-- TMPL_VAR NAME="expiry" --><br>
-		Site d'inscription : <!-- TMPL_VAR NAME="branchcode" -->
+		<p><label class="label100">Numéro de Carte : </label><!-- TMPL_VAR NAME="cardnumber" --><br>
+		<label class="label100">Adresse Postale </label><!-- TMPL_VAR NAME="streetaddress" -->, <!-- TMPL_VAR NAME="zipcode" --> <!-- TMPL_VAR NAME="city" --><br>
+		<!-- TMPL_UNLESS name="I" --><label class="label100">Adresse domicile </label><!-- TMPL_VAR NAME="physstreet" -->, <!-- TMPL_VAR NAME="homezipcode" --> <!-- TMPL_VAR NAME="streetcity" --><br>
+		<label class="label100">Téléphone Domicile </label><!-- TMPL_VAR NAME="phone" --><br><!-- /TMPL_UNLESS -->
+		<label class="label100">Téléphone bureau </label><!-- TMPL_VAR NAME="phoneday" --><br>
+		<label class="label100">Fax </label><!-- TMPL_VAR NAME="faxnumber" --><br>
+		<label class="label100">Mail </label><a href="mailto:<!-- TMPL_VAR NAME="emailaddress" -->"><!-- TMPL_VAR NAME="emailaddress" --></a><br>
+		<label class="label100">Texte </label><!-- TMPL_VAR NAME="textmessaging" --><br>
+		<label class="label100">Numéro d'inscription </label><!-- TMPL_VAR NAME="borrowernumber" --><br>
+		<label class="label100">Catégorie d'inscription </label><!-- TMPL_VAR NAME="categorycode" --><br>
+		<label class="label100">Inscrit </label><!-- TMPL_VAR NAME="dateenrolled" -->, Se termine : <!-- TMPL_VAR NAME="expiry" --><br>
+		<label class="label100">Site d'inscription </label><!-- TMPL_VAR NAME="branchcode" -->
 		</p>
 		<p>
 		<!-- TMPL_IF NAME="printethnicityline" -->
-			Ethnie : <!-- TMPL_VAR NAME="ethnicity" -->, <!-- TMPL_VAR NAME="ethnotes" --><br>
+			<label class="label100">Ethnie </label><!-- TMPL_VAR NAME="ethnicity" -->, <!-- TMPL_VAR NAME="ethnotes" --><br>
 		<!-- /TMPL_IF -->
 		<!-- TMPL_UNLESS name="I" -->
-			D.nais:<!-- TMPL_VAR NAME="dateofbirth" --><br>
-			Sexe <!-- TMPL_VAR NAME="sex" --><br>
+			<label class="label100">Date de naissance </label><!-- TMPL_VAR NAME="dateofbirth" --><br>
+			<label class="label100">Sexe </label><!-- TMPL_VAR NAME="sex" --><br>
 			Autre
 		<!-- /TMPL_UNLESS -->
-		Contact : <!-- TMPL_VAR NAME="contactname" --><br>
-		Téléphone : <!-- TMPL_VAR NAME="altphone" --><br>
+		<label class="label100">Contact : </label><!-- TMPL_VAR NAME="contactname" --><br>
+		<label class="label100">Téléphone </label><!-- TMPL_VAR NAME="altphone" --><br>
 		<!-- TMPL_UNLESS name="I" -->
-			Relation: <!-- TMPL_VAR NAME="altrelationship" --><br>
+			<label class="label100">Relation </label><!-- TMPL_VAR NAME="altrelationship" --><br>
 		<!-- /TMPL_UNLESS -->
-		Notes : <!-- TMPL_VAR NAME="altnotes" -->
+		<label class="label100">Notes : </label><!-- TMPL_VAR NAME="altnotes" -->
 		<!-- TMPL_IF NAME="sort1" -->
-			<p>Champ de tri 1 : <!-- TMPL_VAR NAME="sort1" --></p>
+			<p><label class="label100">Champ de tri 1 </label><!-- TMPL_VAR NAME="sort1" --></p>
 		<!-- /TMPL_IF -->
 		<!-- TMPL_IF NAME="sort2" -->
-			<p>Champ de tri 2 : <!-- TMPL_VAR NAME="sort2" --></p>
+			<p><label class="label100">Champ de tri 2 </label><!-- TMPL_VAR NAME="sort2" --></p>
 		<!-- /TMPL_IF -->
 		</p>
 		<p>
@@ -56,45 +55,40 @@
 		<!-- /TMPL_UNLESS -->
 		</p>
 		<p>
-			Remarques Générales : <!--<a href="popbox.html" onclick="messenger(200,250,'Form that lets you add to and delete notes.'); return false">-->
-			<!-- TMPL_VAR NAME="borrowernotes" --><!--</a>-->
+			<label class="label100">Remarques Générales : </label>
+			<!-- TMPL_VAR NAME="borrowernotes" -->
 		</p>
-
-		<!-- TMPL_IF NAME="IS_ADULT" -->
-			
-			<form action="/cgi-bin/koha/members/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>
-			
-		<!-- /TMPL_IF -->
+		<p>
+			 <label class="label100">OPAC login : </label><!-- TMPL_VAR name="userid" -->
+			 <!-- TMPL_IF name="password" -->(password defined)<!-- TMPL_ELSE -->(no password)<!-- /TMPL_IF -->
+		</p>
+		<p>
 		<!-- TMPL_IF NAME="I" -->
-			<form action="/cgi-bin/koha/members/imemberentry.pl" method="post">
-				<input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->">
-				<input type="submit" class="button" value="Modifier">
-			</form>
+			<a href="/cgi-bin/koha/members/imemberentry.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" class="button">Modifier</a>
 		<!-- TMPL_ELSE -->
-			<form action="/cgi-bin/koha/members/memberentry.pl" method="post">
-				<input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->">
-				<input type="submit" class="button" name="modify" value="Modifier">
-			</form>
+			<a href="/cgi-bin/koha/members/memberentry.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" class="button">Modifier</a>
 		<!-- /TMPL_IF -->
-		<form action="javascript:confirm_deletion()">
-			<input type="hidden" name="member" value="<!-- TMPL_VAR NAME="bornum" -->">
-			<input type="submit" class="button" value="Supprimer">
-		</form>
-		<form action="/cgi-bin/koha/members/member-password.pl" method="post">
-			<input type="hidden" name="member" value="<!-- TMPL_VAR NAME="bornum" -->">
-			<input type="submit" class="button" value="Changer de mot de passe">
-		</form>
-		<form action="/cgi-bin/koha/members/member-flags.pl" method="post">
-			<input type="hidden" name="member" value="<!-- TMPL_VAR NAME="bornum" -->">
-			<input type="submit" class="button" value="Modifier les autorisations d'utilisation">
-		</form>
+		<a href="javascript:confirm_deletion()" class="button">Supprimer</a> <a href="/cgi-bin/koha/circ/circulation.pl?findborrower=<!-- TMPL_VAR NAME="cardnumber" -->" class="button">Prets</a> <a href="/cgi-bin/koha/members/member-password.pl?member=<!-- TMPL_VAR NAME="bornum" -->" class="button">Modifier mdp</a>
+		</p>
+		<br/>
+		<p>
+		<!-- TMPL_IF NAME="IS_ADULT" -->
+			<a href="/cgi-bin/koha/members/jmemberentry.pl?type=Add&bornum=<!-- TMPL_VAR NAME="borrowernumber" -->" class="button">Ajouter un enfant</a>
+		<!-- /TMPL_IF -->
+		<a href="/cgi-bin/koha/members/member-flags.pl?member=<!-- TMPL_VAR NAME="bornum" -->" class="button">Modif habilitations</a> <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;print=page" class="button">Impr page</a> <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;print=slip" class="button">Impr ticket</a>
+		</p>
 	</div>
+	
+<!-- TMPL_IF NAME="flagged" -->	<div class="bloc25">
+		<h2 class="members">Habilitations</h2>
+		<ul>
+		<!-- TMPL_IF NAME="debarred" --><li>Le lecteur est exclu</li><!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="gonenoaddress" --><li>L'adresse du lecteur est erronée</li><!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="lost" --><li>La carte a été déclarée perdue</li><!-- /TMPL_IF -->
+		</ul>
+	</div><!-- /TMPL_IF -->
 
-	<div id="bloc25">
+	<div class="bloc25">
 		<h2 class="members">Dettes & amendes</h2>
 		<!-- TMPL_IF NAME="totaldue" -->
 			Total dû <!-- TMPL_VAR NAME="totaldue"-->
@@ -105,8 +99,8 @@
 			<a class="button" href="/cgi-bin/koha/boraccount.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->"> Visualiser le compte </a> <a class="button" href="/cgi-bin/koha/pay.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->"> Régler des amendes </a>
 		</p>
 	</div>
-	<div id="bloc25">
-		<h2 class="members">exemplaires demandés</h2>
+	<div class="bloc25">
+		<h2 class="members">Documents réservés</h2>
 			<!-- TMPL_IF NAME="reserveloop" -->
 			<form action="/cgi-bin/koha/modrequest.pl" method="post">
 			<table>
@@ -145,15 +139,15 @@
 				</table>
 				</form>
 			<!-- TMPL_ELSE -->
-				Sans
+				Aucun
 			<!-- /TMPL_IF -->
 	</div>
 
-	<div id="bloc25">
+	<div class="bloc25">
 		<a class="button" href="/cgi-bin/koha/readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">Liste des lectures</a>
 	</div>
 
-	<div id="bloc25">
+	<div class="bloc25">
 		<h2 class="members">exemplaire actuellement en prêt</h2>
 		<!-- TMPL_IF NAME="issueloop" -->
 			<form action="../renewscript.pl" method="post">
@@ -193,7 +187,7 @@
 			<input type="submit" class="button" value="Exemplaires Renouvellés">
 		</form>
 		<!-- TMPL_ELSE -->
-			Sans
+			Aucun
 		<!-- /TMPL_IF -->
 	</div>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/members/newjmember.tmpl b/koha-tmpl/intranet-tmpl/default/fr/members/newjmember.tmpl
index e71bdb6a8f..cc102b6843 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/members/newjmember.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/members/newjmember.tmpl
@@ -48,7 +48,7 @@
 					</tr>
 					<tr valign="top" bgcolor="white" >
 						<td>
-						<b>Barcode Number</b>
+						<b>Code à barres</b>
 						</td>
 						<td>
 						<!-- TMPL_VAR NAME="cardchild" -->
@@ -93,7 +93,7 @@
 			<!-- 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="soumettre" class="button members">
+			<input type="submit" name="submit" value="valider" class="button members">
 		</form>
 	<!-- /TMPL_IF -->
 </div>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/members/newmember.tmpl b/koha-tmpl/intranet-tmpl/default/fr/members/newmember.tmpl
index fcef2b8c65..4f56cba6d7 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/members/newmember.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/members/newmember.tmpl
@@ -223,7 +223,7 @@
 			<!-- 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="Soumettre">
+			<input type="submit" name="submit" value="Valider">
 		</form>
 <!-- TMPL_ELSE -->
 	<h1>ERREUR</h1>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/members/readingrec.tmpl b/koha-tmpl/intranet-tmpl/default/fr/members/readingrec.tmpl
index 0f108ec750..84ec76a40d 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/members/readingrec.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/members/readingrec.tmpl
@@ -6,7 +6,7 @@
 	
 	<!-- TMPL_IF NAME="showfulllink" -->
 	<p><a href="readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->&amp;limit=50">Voir les 50 derniers seulement</a></p><!-- TMPL_ELSE -->
-	<p><a href="readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->&amp;limit=full">Sortie complète</a></p>
+	<p><a href="readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->&amp;limit=full">Totalité des emprunts</a></p>
 	<!-- /TMPL_IF -->
 	
 	<table>
@@ -28,8 +28,13 @@
 		</th>
 	</tr>
 	<!-- TMPL_LOOP NAME="loop_reading" -->
-	<tr>
-		<td><!-- TMPL_VAR NAME="biblionumber" -->
+	<!-- TMPL_IF NAME="toggle" -->
+		<tr class="hilighted">
+	<!-- TMPL_ELSE -->
+		<tr>
+	<!-- /TMPL_IF -->
+		<td>
+			<!-- TMPL_VAR NAME="biblionumber" -->
 			<!-- TMPL_VAR NAME="title" -->&nbsp;
 		</td>
 		<td>
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 7fda98497d..9eeb6c8846 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/parameters/admin-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/parameters/admin-home.tmpl
@@ -38,10 +38,10 @@
 </tr>
 <tr>
 	<td valign="top" width="25%"><a href="/cgi-bin/koha/admin/authtypes.pl">Structure des autorités</a></td>
-	<td>Définir des catégories et les structures  des autorités MARC </td>
+	<td>Définir des catégories et les structures  des autorités MARC</td>
 </tr>
 <tr>
-	<td valign="top" width="25%"><a href="/cgi-bin/koha/admin/biblio_framework.pl">Grille de catalogage</a></td>
+	<td valign="top" width="25%"><a href="/cgi-bin/koha/admin/biblio_framework.pl">Grilles de catalogage</a></td>
 	<td>Les grilles définies pour l'éditeur MARC.Créer des grilles, puis déterminer la structure MARC (champs et sous-champs)</td>
 </tr>
 <tr>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/parameters/aqbookfund.tmpl b/koha-tmpl/intranet-tmpl/default/fr/parameters/aqbookfund.tmpl
index 670c283abc..387c2607ea 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/parameters/aqbookfund.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/parameters/aqbookfund.tmpl
@@ -161,7 +161,7 @@
 	<!-- /TMPL_IF -->
 	
 	<!-- TMPL_IF NAME="delete_confirmed" -->
-	Donnée détruite
+	Donnée supprimée
 	<form action="<!-- TMPL_VAR NAME="action" -->" method="post">
 	<input type="submit" value="OK">
 	</form>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/parameters/aqbudget.tmpl b/koha-tmpl/intranet-tmpl/default/fr/parameters/aqbudget.tmpl
index 94d349c59d..3ae0ee8c15 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/parameters/aqbudget.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/parameters/aqbudget.tmpl
@@ -169,7 +169,7 @@
 	<!-- /TMPL_IF -->
 	
 	<!-- TMPL_IF NAME="delete_confirmed" -->
-	Donnée détruite
+	Donnée supprimée
 	<form action="<!-- TMPL_VAR NAME="action" -->" method="post">
 	<input type="submit" value="OK">
 	</form>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/parameters/auth_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/default/fr/parameters/auth_subfields_structure.tmpl
index 003f0d442a..7f309d161a 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/parameters/auth_subfields_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/parameters/auth_subfields_structure.tmpl
@@ -5,7 +5,7 @@
 <!-- ------------------------------------------------------------------------ -->
 	<h1>
 	<!-- TMPL_IF NAME="use-heading-flags-p" -->
-	<!-- TMPL_IF NAME="heading-edit-subfields-p" -->Ouvrir les sous-champs<!-- /TMPL_IF -->
+	<!-- TMPL_IF NAME="heading-edit-subfields-p" -->Editer les sous-champs<!-- /TMPL_IF -->
 	<!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF -->
 	</h1>
 	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
@@ -16,7 +16,7 @@
 		<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
 		<td>
 			<h2 class="parameters">Etiquette <!-- TMPL_VAR NAME="tagfield" -->, Sous-champ <!-- TMPL_VAR NAME="tagsubfield" --></h2>
-			<h3>Occurences MARC</h3>
+			<h3>Restrictions MARC</h3>
 			<p>
 				<label>&nbsp;</label><!-- TMPL_VAR NAME="repeatable" --> répétable <!-- TMPL_VAR NAME="mandatory" --> obligatoire
 			</p>
@@ -24,7 +24,7 @@
 				<label>&nbsp;</label>
 				<label>Rechercher aussi</label><input type="text" name="seealso" value="<!-- TMPL_VAR name="seealso" -->" size=20> (exemple pour 200a : '200c','200d','200e')
 			</p>
-			<h3>Editeur des contraintes</h3>
+			<h3>Editeur des restrictions</h3>
 			<p> <label>&nbsp;</label>
 				<label>Texte pour le bibliothécaire</label>
 				<input type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" -->" size="40" maxlength="80">
@@ -34,10 +34,10 @@
 				<label>Texte pour l'OPAC</label> <input type="text" name="libopac" value="<!-- TMPL_VAR NAME="libopac" -->" size="40" maxlength="80">
 			</p>
 			<p><label>&nbsp;</label><label>Géré</label> <!-- TMPL_VAR NAME="tab" --></p>
-			<p><label>&nbsp;</label><!-- TMPL_VAR NAME="hidden" --> caché (champ géré, mais caché. - devrait être rempli par un module d'extension ou une liste d'autorité-)</p>
+			<p><label>&nbsp;</label><!-- TMPL_VAR NAME="hidden" --> caché (champ géré, mais caché. - devrait être rempli par un module d'extension ou un type d'autorité-)</p>
 			<p><label>&nbsp;</label><!-- TMPL_VAR NAME="isurl" --> URL (si coché, indique que le champ est une URL valide et peut-être cliquée</p>
 			<p>
-				<label>&nbsp;</label><label>Valeur Autorisée :</label> <!-- TMPL_VAR NAME="authorised_value" --> ou liste d'autorité : <!-- TMPL_VAR NAME="thesaurus_category" --> ou module d'extension : <!-- TMPL_VAR NAME="value_builder" -->
+				<label>&nbsp;</label><label>Valeur Autorisée :</label> <!-- TMPL_VAR NAME="authorised_value" --> ou type d'autorité : <!-- TMPL_VAR NAME="thesaurus_category" --> ou module d'extension : <!-- TMPL_VAR NAME="value_builder" -->
 			</p>
 		</td>
 		</tr>
@@ -46,7 +46,7 @@
 	<input type="submit" value="OK" class="button parameters">
 	<p>Remarque : dans la dernière colonne, vous pouvez choisir :
 	<ul><li>Une "valeur autorisée" : renvoie à une liste de valeurs autorisées pour le sous-champ. Voir dans la table de gestion correspondante</li>
-	<li>"plug in" les plugins sont des programmes Perl qui vous aident à entrer la valeur d'un sous champ. Ils changent en fonction de votre déclinaison MARC et remplissent parfois un autre champ automatiquement</li>
+	<li>"module d'extension" les modules d'extension sont des programmes Perl qui vous aident à remplir un sous-champ. Ils changent en fonction de votre format MARC et remplissent parfois un autre champ automatiquement.</li>
 	</ul>
 	</p>
 	</form>
@@ -77,13 +77,13 @@
 <!-- ------------------------------------------------------------------------ -->
 <!-- TMPL_IF NAME="else" -->
 <h1>Gestion de la structure des sous-champs Marc autorités pour le champ <!-- TMPL_VAR NAME="tagfield" --> <!-- TMPL_IF NAME="authtypecode" -->(grille <!--TMPL_VAR NAME="authtypecode" -->)<!-- TMPL_ELSE -->(grille par défaut)<!-- /TMPL_IF --></h1>
-<p>Cet écran montre les sous-champs  associés au champ sélectionné.Vous pouvez ouvrir les sous-champs ou en ajouter de nouveaux en cliquant sur edit. </p>
+<p>Cette page montre les sous-champs associés au champ sélectionné.Vous pouvez éditer les sous-champs ou en ajouter de nouveaux en cliquant sur editer. </p>
 
 <table>
 <tr>
 	<th>Sous-champ</th>
 	<th>Texte</th>
-	<th>Contraintes</th>
+	<th>Restrictions</th>
 	<th>Supprimer</th>
 <!-- TMPL_LOOP NAME="loop" -->
 <tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
diff --git a/koha-tmpl/intranet-tmpl/default/fr/parameters/auth_tag_structure.tmpl b/koha-tmpl/intranet-tmpl/default/fr/parameters/auth_tag_structure.tmpl
index 87fa37e47e..faccd9a6f0 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/parameters/auth_tag_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/parameters/auth_tag_structure.tmpl
@@ -70,7 +70,7 @@
 		<p><label>Texte pour l'OPAC</label><input type="text" name="libopac" value="<!-- TMPL_VAR NAME="libopac" escape=HTML -->" size="80" maxlength="100"></p>
 		<p><label>Répétable</label><!-- TMPL_VAR NAME="repeatable" --></p>
 		<p><label>Obligatoire</label><!-- TMPL_VAR NAME="mandatory" --></p>
-		<p><label>Valeur autorisée</label><!-- TMPL_VAR NAME="authorised_value" --> (si vous sélectionnez une valeur ici, les informations seront limités à la liste des valeurs autorisées)</p>
+		<p><label>Valeur autorisée</label><!-- TMPL_VAR NAME="authorised_value" --> (si vous sélectionnez une valeur ici, les informations seront limitées à la liste des valeurs autorisées)</p>
 		<p><label>&nbsp;</label><input type="button" value="OK" class="button" onclick="Check(this.form)"></p>
 	</form>
 <!-- /TMPL_IF -->
@@ -88,6 +88,7 @@
 	</tr>
 	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
 		<input type="hidden" name="op" value="delete_confirmed">
+		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR name="authtypecode" -->">
 		<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
 	<tr><td colspan="2" align="center">CONFIRMEZ 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="NON"></form></td></tr>
@@ -95,7 +96,7 @@
 
 <!-- TMPL_IF NAME="delete_confirmed" -->
 <!-- ------------------------------------------------------------------------ -->
-	Donnée détruite
+	Donnée supprimée
 	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
 	<input type="submit" value="OK">
 	</form>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/parameters/biblio_framework.tmpl b/koha-tmpl/intranet-tmpl/default/fr/parameters/biblio_framework.tmpl
index 41163df3f0..962cf4032f 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/parameters/biblio_framework.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/parameters/biblio_framework.tmpl
@@ -102,7 +102,7 @@ function Check(f) {
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="else" -->
-<h1>Grille de catalogage</h1>
+<h1>Grilles de catalogage</h1>
 <p>nom de grille, puis aller à la structure MARC  pour déterminer les paramètres de l'éditeur MARC</p>
 <table>
 	<tr>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/parameters/categorie.tmpl b/koha-tmpl/intranet-tmpl/default/fr/parameters/categorie.tmpl
index c1a92d2416..4fa368463d 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/parameters/categorie.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/parameters/categorie.tmpl
@@ -96,7 +96,7 @@
 				</td>
 			</tr>
 			<tr>
-				<td>Période d'inscription</td>
+				<td>Durée d'inscription</td>
 				<td>
 					<input type="text" name="enrolmentperiod" size="3" maxlength="2" value="<!-- TMPL_VAR NAME="enrolmentperiod" -->"> ans
 				</td>
@@ -120,7 +120,7 @@
 				</td>
 			</tr>
 			<tr>
-				<td>Avis de retard demandé</td>
+				<td>Note de retard demandée</td>
 				<td>
 					<select name="overduenoticerequired">
 						<option<!-- TMPL_UNLESS name="overduenoticerequired" --> selected<!-- /TMPL_UNLESS --> value="0">Non</option>
@@ -172,7 +172,7 @@
 				<td><!-- TMPL_VAR NAME="description" --></td>
 			</tr>
 			<tr>
-				<td>Période d'inscription</td>
+				<td>Durée d'inscription</td>
 				<td><!-- TMPL_VAR NAME="enrolmentperiod" --> année(s)</td>
 			</tr>
 			<tr>
@@ -188,7 +188,7 @@
 				<td><!-- TMPL_VAR NAME="enrolmentfee" --></td>
 			</tr>
 			<tr>
-				<td>Avis de retard demandé</td>
+				<td>Note de retard demandée</td>
 				<td><!-- TMPL_IF NAME="overduenoticerequired" -->Oui<!-- TMPL_ELSE -->Non<!-- /TMPL_IF --></td>
 			</tr>
 			<tr>
@@ -219,7 +219,7 @@
 	<!-- /TMPL_IF -->
 
 	<!-- TMPL_IF NAME="delete_confirmed" -->
-		Donnée détruite
+		Donnée supprimée
 		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
 		<input type="submit" value="OK">
 		</form>
@@ -233,12 +233,12 @@
 		<!-- /TMPL_IF -->
 		<!-- TMPL_UNLESS name="categoryChild" -->
 			<div id="problem">
-				ATTENTION : vous devez créer un code de catégorie = E pour les enfants
+				ATTENTION : pour les enfants vous devez utiliser le code de catégorie = C 
 			</div>
 		<!-- /TMPL_UNLESS -->
 		<!-- TMPL_UNLESS name="categoryInstitution" -->
 			<div id="problem">
-				ATTENTION : vous devez créer un code de catégorie = C pour les Collectivités
+				ATTENTION : pour les collectivités vous devez utiliser le code de catégorie = I
 			</div>
 		<!-- /TMPL_UNLESS -->
 		<form action="<TMPL_VAR NAME="script_name">" method="post">
@@ -250,33 +250,29 @@
 			<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>Période d'inscription</b></td>
+				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Durée d'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>Limite d'âge supérieure</b></td>
 				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Age requis</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>Retard</b></td>
-				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Prêts maximum</b></td>
 				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Réservation</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" -->">
+			<tr<!-- TMPL_IF NAME="toggle" --> class="hilighted"<!-- /TMPl_IF -->>
 				<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&amp;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&amp;categorycode=<!-- TMPL_VAR NAME="categorycode" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" border="0"></a></td>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/parameters/categoryitem.tmpl b/koha-tmpl/intranet-tmpl/default/fr/parameters/categoryitem.tmpl
index b2721775ea..384bc44c5f 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/parameters/categoryitem.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/parameters/categoryitem.tmpl
@@ -93,7 +93,7 @@
                         </td>
                 </tr>
                 <tr>
-                        <td>Période d'inscription</td>
+                        <td>Durée d'inscription</td>
                         <td>
                                 <input type="text" name="enrolmentperiod" value="<!-- TMPL_VAR NAME="enrolmentperiod" -->">
                         </td>
@@ -129,7 +129,7 @@
                         </td>
                 </tr>
                 <tr>
-                        <td>Avis de retard demandé</td>
+                        <td>Note de retard demandée</td>
                         <td>
                                 <input type="text" name="overduenoticerequired" value="<!-- TMPL_VAR NAME="overduenoticerequired" -->">
                         </td>
@@ -175,7 +175,7 @@
                         <td><!-- TMPL_VAR NAME="description" --></td>
                 </tr>
                 <tr>
-                        <td>Période d'inscription</td>
+                        <td>Durée d'inscription</td>
                         <td><!-- TMPL_VAR NAME="enrolmentperiod" --></td>
                 </tr>
                 <tr>
@@ -199,7 +199,7 @@
                         <td><!-- TMPL_VAR NAME="enrolmentfee" --></td>
                 </tr>
                 <tr>
-                        <td>Avis de retard demandé</td>
+                        <td>Note de retard demandée</td>
                         <td><!-- TMPL_VAR NAME="overduenoticerequired" --></td>
                 </tr>
                 <tr>
@@ -230,7 +230,7 @@
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="delete_confirmed" -->
-        Donnée détruite
+        Donnée supprimée
         <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
         <input type="submit" value="OK">
         </form>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/parameters/currency.tmpl b/koha-tmpl/intranet-tmpl/default/fr/parameters/currency.tmpl
index 5e12360753..2afc5211b2 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/parameters/currency.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/parameters/currency.tmpl
@@ -141,7 +141,7 @@
 	<!-- /TMPL_IF -->
 	
 	<!-- TMPL_IF NAME="delete_confirmed" -->
-		Donnée détruite
+		Donnée supprimée
 		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
 			<input type="submit" value="OK">
 		</form>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/parameters/issuingrules.tmpl b/koha-tmpl/intranet-tmpl/default/fr/parameters/issuingrules.tmpl
index efe8deb0de..d84c09dda5 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/parameters/issuingrules.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/parameters/issuingrules.tmpl
@@ -4,7 +4,7 @@
 	<div id="bloc25">
 		<h2 class="parameters">Astuces pour les prêts</h2>
 		<p>Remplir chaque pavé  avec la durée du prêt, le nombre maximum de prêts</p>
-		<p>égal à 21,5 permet 5 prêts pour une durée de 21 jours</p>
+		<p> - par exemple : 21,5 autorisé 21 jours et 5 documents</p>
 		<h2 class="parameters">Astuce pour les amendes</h2>
 		<p>Chaque cellule doit être remplie avec l'amende, l'échéance et la durée des charges</p>
 		<p>par ex. 1,7,7 = 1Eur d'amende, au bout de 7 jours, par tranche de 7 jours</p>
@@ -45,7 +45,7 @@
 						<!-- TMPL_VAR NAME="categorycode" -->
 					</th>
 					<!-- TMPL_LOOP NAME="cell" -->
-						<td bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
+						<td<!-- TMPL_IF NAME="toggle" --> class="hilighted"<!-- /TMPL_IF -->>
 							<input name="<!-- TMPL_VAR NAME="issuingname" -->" value="<!-- TMPL_VAR NAME="issuingvalue" -->" size="6" maxlength="10"> /
 							<input name="<!-- TMPL_VAR NAME="finesname" -->" value="<!-- TMPL_VAR NAME="finesvalue" -->" size="6" maxlength="10">
 						</td>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/parameters/itemtypes.tmpl b/koha-tmpl/intranet-tmpl/default/fr/parameters/itemtypes.tmpl
index 1ef6533c4c..89d2404c9f 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/parameters/itemtypes.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/parameters/itemtypes.tmpl
@@ -125,11 +125,12 @@ function Check(f) {
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="else" -->
-<h1 class="parameters">Gestion des types de documents</h1>
+<h1 class="parameters">Gestion des types de document</h1>
 <table>
 	<tr>
 		<th class="parameters">Code</th>
 		<th class="parameters">Description</th>
+		<th class="parameters">not for loan</th>
 		<th class="parameters">Renouvelable</th>
 		<th class="parameters">Frais</th>
 		<th class="parameters">Editer</th>
@@ -139,13 +140,16 @@ function Check(f) {
 		<tr>
 			<td><!-- TMPL_VAR NAME="itemtype" --></td>
 			<td><!-- TMPL_VAR NAME="description" --></td>
-			<td><!-- TMPL_IF NAME="renewalsallowed" -->
-					<!-- TMPL_VAR name="renewalsallowed" --> fois
-				<!-- TMPL_ELSE -->
-					Non
-				<!-- /TMPL_IF -->
+			<td><!-- TMPL_IF NAME="notforloan" -->Oui<!-- /TMPL_IF --></td>
+			<td><!-- TMPL_UNLESS name="notforloan" -->
+					<!-- TMPL_IF NAME="renewalsallowed" -->
+						<!-- TMPL_VAR name="renewalsallowed" --> fois
+					<!-- TMPL_ELSE -->
+						Non
+					<!-- /TMPL_IF -->
+				<!-- /TMPL_UNLESS -->
 			</td>
-			<td><!-- TMPL_VAR NAME="rentalcharge" --></td>
+			<td><!-- TMPL_UNLESS name="notforloan" --><!-- TMPL_VAR NAME="rentalcharge" --><!-- /TMPL_UNLESS --></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>
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 659a255f75..2901299ed1 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
@@ -7,7 +7,7 @@
 <!-- ------------------------------------------------------------------------ -->
 	<h1>
 	<!-- TMPL_IF NAME="use-heading-flags-p" -->
-	<!-- TMPL_IF NAME="heading-edit-subfields-p" -->Ouvrir les contraintes des sous-champs MARC<!-- /TMPL_IF -->
+	<!-- TMPL_IF NAME="heading-edit-subfields-p" -->Editer les restrictions des sous-champs MARC<!-- /TMPL_IF -->
 	<!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF -->
 	</h1>
 	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
@@ -15,10 +15,10 @@
 	<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
 	<table>
 	<!-- TMPL_LOOP NAME="loop" -->
-		<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
+		<tr>
 		<td>
 			<h2 class="parameters">Etiquette <!-- TMPL_VAR NAME="tagfield" -->, Sous-champ <!-- TMPL_VAR NAME="tagsubfield" --></h2>
-			<h3>Occurences MARC</h3>
+			<h3>Restrictions MARC</h3>
 			<p>
 				<label>&nbsp;</label><!-- TMPL_VAR NAME="repeatable" --> répétable <!-- TMPL_VAR NAME="mandatory" --> obligatoire
 			</p>
@@ -27,7 +27,7 @@
 				<label>Rechercher aussi</label><input type="text" name="seealso" value="<!-- TMPL_VAR name="seealso" -->" size=20> (exemple pour 200a : '200c','200d','200e')
 			</p>
 			<p><label>&nbsp;</label><label>Lien Koha:</label> <!-- TMPL_VAR NAME="kohafield" --></p>
-			<h3>Editeur des contraintes</h3>
+			<h3>Editeur des restrictions</h3>
 			<p> <label>&nbsp;</label>
 				<label>Texte pour le bibliothécaire</label>
 				<input type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" -->" size="40" maxlength="80">
@@ -36,11 +36,11 @@
 				<label>&nbsp;</label>
 				<label>Texte pour l'OPAC</label> <input type="text" name="libopac" value="<!-- TMPL_VAR NAME="libopac" -->" size="40" maxlength="80">
 			</p>
-			<p><label>&nbsp;</label><label>Géré dans l'onglet</label> <!-- TMPL_VAR NAME="tab" --> (non reconnu signifie que le sous-champ n'est pas géré par Koha)</p>
-			<p><label>&nbsp;</label><!-- TMPL_VAR NAME="hidden" --> caché (champ géré, mais caché. - devrait être rempli par un module d'extension ou une liste d'autorité-)</p>
+			<p><label>&nbsp;</label><label>Géré dans l'onglet</label> <!-- TMPL_VAR NAME="tab" --> (ignorer signifie que le sous-champ n'est pas géré par Koha)</p>
+			<p><label>&nbsp;</label><!-- TMPL_VAR NAME="hidden" --> caché (champ géré, mais caché. - devrait être rempli par un module d'extension ou un type d'autorité-)</p>
 			<p><label>&nbsp;</label><!-- TMPL_VAR NAME="isurl" --> URL (si coché, indique que le champ est une URL valide et peut-être cliquée</p>
 			<p>
-				<label>&nbsp;</label><label>Valeur Autorisée :</label> <!-- TMPL_VAR NAME="authorised_value" --> ou liste d'autorité : <!-- TMPL_VAR NAME="authtypes" --> ou module d'extension : <!-- TMPL_VAR NAME="value_builder" --> ou lien : <input type="text" name="link" value="<!-- TMPL_VAR NAME="link" -->" size="10" maxlength="5"> (exemple 200b)
+				<label>&nbsp;</label><label>Valeur Autorisée :</label> <!-- TMPL_VAR NAME="authorised_value" --> ou type d'autorité : <!-- TMPL_VAR NAME="authtypes" --> ou module d'extension : <!-- TMPL_VAR NAME="value_builder" --> ou lien : <input type="text" name="link" value="<!-- TMPL_VAR NAME="link" -->" size="10" maxlength="5"> (exemple 200b)
 			</p>
 		</td>
 		</tr>
@@ -49,8 +49,8 @@
 	<input type="submit" value="OK">
 	<p>Remarque : dans la dernière colonne, vous pouvez choisir :
 	<ul><li>Une "valeur autorisée" : renvoie à une liste de valeurs autorisées pour le sous-champ. Voir dans la table de gestion correspondante</li>
-	<li>Une "catégorie d'autorité" : cela renvoie à une catégorie d'autorité.Voir la table d'administration correspondante.</li>
-	<li>"plug in" les plugins sont des programmes Perl qui vous aident à entrer la valeur d'un sous champ. Ils changent en fonction de votre déclinaison MARC et remplissent parfois un autre champ automatiquement</li>
+	<li>Un "type d'autorité" : cela renvoie à une catégorie d'autorité.Voir la table d'administration correspondante.</li>
+	<li>"module d'extension" les modules d'extension sont des programmes Perl qui vous aident à remplir un sous-champ. Ils changent en fonction de votre format MARC et remplissent parfois un autre champ automatiquement.</li>
 	</ul>
 	</p>
 	</form>
@@ -90,7 +90,7 @@
 
 <!-- TMPL_IF NAME="delete_confirmed" -->
 <!-- ------------------------------------------------------------------------ -->
-	Donnée détruite
+	Donnée supprimé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>
@@ -99,17 +99,17 @@
 <!-- ------------------------------------------------------------------------ -->
 <!-- TMPL_IF NAME="else" -->
 <h1>Gestion de la structure des sous-champs MARC pour <!-- TMPL_VAR NAME="tagfield" --> (Grille <!--TMPL_VAR NAME="frameworkcode" -->)</h1>
-<p>Cet écran montre les sous-champs  associés au champ sélectionné.Vous pouvez ouvrir les sous-champs ou en ajouter de nouveaux en cliquant sur edit. </p>
+<p>Cette page montre les sous-champs associés au champ sélectionné.Vous pouvez éditer les sous-champs ou en ajouter de nouveaux en cliquant sur editer. </p>
 <p>La colonne <b>Champ Koha</b> montre que le sous-champ est lié à un champ Koha. Koha peut présenter une interface MARC ou une interface Koha. Ce lien assure la synchronisation des deux modes (dans la base de données), de cette façon vous pouvez passer du mode MARC au mode non-MARC facilement.</p>
 
 <table>
 <tr>
 	<th>Sous-champ</th>
 	<th>Texte</th>
-	<th>Contraintes</th>
+	<th>Restrictions</th>
 	<th>Supprimer</th>
 <!-- TMPL_LOOP NAME="loop" -->
-<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
+<tr<!-- TMPL_IF NAME="toggle" --> class="hilighted"<!-- /TMPL_IF -->>
 	<td><!-- TMPL_VAR NAME="tagsubfield" --></td>
 	<td>
 		<!-- TMPL_IF NAME="subfield_ignored" -->
@@ -139,9 +139,7 @@
 </tr>
 <!-- /TMPL_LOOP -->
 </table>
-<!-- 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>
+<a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;tagfield=<!-- TMPL_VAR NAME="edit_tagfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="edit_frameworkcode" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a>
 <a href="marctagstructure.pl?searchfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->">
 	<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/2uparrow.png" width="32" hspace="0" vspace="0" border="0">
 </a>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/parameters/marctagstructure.tmpl b/koha-tmpl/intranet-tmpl/default/fr/parameters/marctagstructure.tmpl
index 436abb4436..b83cd9a337 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/parameters/marctagstructure.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/parameters/marctagstructure.tmpl
@@ -70,7 +70,7 @@
 		<p><label>Libellé pour l'OPAC</label><input type="text" name="libopac" value="<!-- TMPL_VAR NAME="libopac" escape=HTML -->" size="80" maxlength="100"></p>
 		<p><label>Répétable</label><!-- TMPL_VAR NAME="repeatable" --></p>
 		<p><label>Obligatoire</label><!-- TMPL_VAR NAME="mandatory" --></p>
-		<p><label>Valeur autorisée</label><!-- TMPL_VAR NAME="authorised_value" --> (si vous sélectionnez une valeur ici, les informations seront limités à la liste des valeurs autorisées)</p>
+		<p><label>Valeur autorisée</label><!-- TMPL_VAR NAME="authorised_value" --> (si vous sélectionnez une valeur ici, les informations seront limitées à la liste des valeurs autorisées)</p>
 		<p><label>&nbsp;</label><input type="button" value="OK" class="button" onclick="Check(this.form)"></p>
 	</form>
 <!-- /TMPL_IF -->
@@ -91,7 +91,7 @@
 
 <!-- TMPL_IF NAME="delete_confirmed" -->
 <!-- ------------------------------------------------------------------------ -->
-	Donnée détruite
+	Donnée supprimée
 	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
 	<input type="submit" value="OK">
 	</form>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/parameters/printers.tmpl b/koha-tmpl/intranet-tmpl/default/fr/parameters/printers.tmpl
index 97f00c8424..1695c501d2 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/parameters/printers.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/parameters/printers.tmpl
@@ -85,7 +85,7 @@
 	<!-- /TMPL_IF -->
 
         	<tr>
-			<td>En attente</td>
+			<td>File d'attente</td>
 			<td><input type="text" name="printqueue" size="50" maxlength="50" value="<!-- TMPL_VAR NAME="printqueue" -->"> </td>
 		</tr>
         	<tr>
@@ -120,7 +120,7 @@
 			<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
         
 		<tr>
-			<td>En attente</td>
+			<td>File d'attente</td>
 			<td><!-- TMPL_VAR NAME="printqueue" --></td>
 		</tr>
         	<tr>
@@ -145,7 +145,7 @@
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="delete_confirmed" -->
-	Donnée détruite
+	Donnée supprimée
 	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
 		<input type="submit" value="OK">
 	</form>
@@ -165,7 +165,7 @@
 	<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>En attente</b></td>
+			<td background="/images/background-mem.gif"><b>File d'attente</b></td>
 			<td background="/images/background-mem.gif"><b>Type</b></td>
 			<td background="/images/background-mem.gif"> </td>
 			<td background="/images/background-mem.gif"> </td>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/parameters/stopwords.tmpl b/koha-tmpl/intranet-tmpl/default/fr/parameters/stopwords.tmpl
index 0f43052d77..401142d198 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/parameters/stopwords.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/parameters/stopwords.tmpl
@@ -99,7 +99,7 @@
 	<!-- /TMPL_IF -->
 	
 	<!-- TMPL_IF NAME="delete_confirmed" -->
-			Donnée détruite
+			Donnée supprimée
 			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
 					<input type="submit" value="OK" class="button">
 			</form>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/parameters/systempreferences.tmpl b/koha-tmpl/intranet-tmpl/default/fr/parameters/systempreferences.tmpl
index d36aebb162..68dc8653e3 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/parameters/systempreferences.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/parameters/systempreferences.tmpl
@@ -127,7 +127,7 @@
 	
 	<!-- TMPL_IF NAME="delete_confirmed" -->
 	
-		Donnée détruite
+		Donnée supprimée
 		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
 		<input type="submit" value="OK">
 		</form>
@@ -147,7 +147,7 @@
 		<th colspan="3">Explication</th>
 	</tr>
 	<!-- TMPL_LOOP NAME="loop" -->
-	<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
+	<!-- TMPL_IF NAME="toggle" --><tr valign="top" class="hilighted"><!-- TMPL_ELSE --><tr valign="top"><!-- /TMPL_IF -->
 		<td><!-- TMPL_VAR NAME="variable" --></td>
 		<td><!-- TMPL_VAR NAME="value" --></td>
 		<td><!-- TMPL_VAR NAME="explanation" --></td>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/parameters/z3950servers.tmpl b/koha-tmpl/intranet-tmpl/default/fr/parameters/z3950servers.tmpl
index 9f11dfb9ee..ace6f15c00 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/parameters/z3950servers.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/parameters/z3950servers.tmpl
@@ -183,7 +183,7 @@
 	<!-- /TMPL_IF -->
 
 	<!-- TMPL_IF NAME="delete_confirmed" -->
-			Donnée détruite
+			Donnée supprimée
 			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
 					<input type="submit" value="OK">
 			</form>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/reports/issues_by_borrower_category.tmpl b/koha-tmpl/intranet-tmpl/default/fr/reports/issues_by_borrower_category.tmpl
index 18cedb1a40..8a2ecae3f9 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/reports/issues_by_borrower_category.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/reports/issues_by_borrower_category.tmpl
@@ -37,7 +37,7 @@
 	</table>
 <!-- /TMPL_LOOP -->
 <!-- TMPL_ELSE -->
-	<h1>Prêts par catégories de lecteurs</h1>
+	<h1>Prêts par catégorie de lecteur</h1>
 	<form method="post">
 		<p>Sélectionner une catégorie de lecteur (ou rien si vous souhaitez visualiser l'état global) <input type="text" name="value"></p>
 		<p>Sélectionnez une annexe : <!-- TMPL_VAR NAME="CGIbranch" --></p>
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 f7b4e58e24..73e4dcc78f 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/reports/reports-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/reports/reports-home.tmpl
@@ -8,7 +8,7 @@
 	<li><a href="/cgi-bin/koha/overdue.pl">Documents en retard</a></li>
 	<li><a href="/cgi-bin/koha/reports/inventory.pl">Inventaire/récolement</a></li>
 	<li><a href="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">Recherche par Type de document</a></li>
-	<li><a href="/cgi-bin/koha/reports/manager.pl?report_name=issues_by_borrower_category">Prêts par catégories de lecteurs</a></li>
+	<li><a href="/cgi-bin/koha/reports/manager.pl?report_name=issues_by_borrower_category">Prêts par catégorie de lecteur</a></li>
 	
 </ul>
 </div>
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 56e85f4d97..5ddfed5d3b 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/search.marc/search.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/search.marc/search.tmpl
@@ -135,7 +135,7 @@
 				<option value="50">50</option>
 				<option value="100">100</option>
 			</select>
-		Commandé par
+		Trié par
 			<select name="orderby" size="1">
 				<option value="biblio.title">Titre</option>
 				<option value="biblio.author">Auteur</option>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/updatebiblio.tmpl b/koha-tmpl/intranet-tmpl/default/fr/updatebiblio.tmpl
index 71e38aba24..61d6ef2cd6 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/updatebiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/updatebiblio.tmpl
@@ -2,7 +2,7 @@
 
 
 <!-- TMPL_VAR NAME="error" -->
-<p> Cliquer sur soumettre pour forcer le sujet
+<p> Cliquer sur valider pour forcer le sujet
 <br>
 <form action="/cgi-bin/koha/updatebiblio.pl" method="post">
 <table border="0" cellspacing="0" cellpadding="5">
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 56d59dfb26..ee274621b4 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
@@ -14,9 +14,9 @@
 		<td>
 			<select name="f2" size="1">
 	    <!-- TMPL_IF name="f2 " -->
-              <option value=" " SELECTED>Sans</option>
+              <option value=" " SELECTED>Aucun</option>
                  <!-- TMPL_ELSE -->
-                    <option value=" ">Sans</option>
+                    <option value=" ">Aucun</option>
 
 			<!-- /TMPL_IF -->
 
@@ -118,9 +118,9 @@
 		<td>
 			<select name="f5" size="1">
 	    <!-- TMPL_IF name="f5 " -->
-              <option value=" " SELECTED>Sans</option>
+              <option value=" " SELECTED>Aucun</option>
                  <!-- TMPL_ELSE -->
-                    <option value=" ">Sans</option>
+                    <option value=" ">Aucun</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5a" -->
@@ -172,9 +172,9 @@
 		<td>
 			<select name="f6" size="1">
 	    <!-- TMPL_IF name="f6 " -->
-              <option value=" " SELECTED>Sans</option>
+              <option value=" " SELECTED>Aucun</option>
                  <!-- TMPL_ELSE -->
-                    <option value=" ">Sans</option>
+                    <option value=" ">Aucun</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6a" -->
@@ -226,9 +226,9 @@
 		<td>
 			<select name="f7" size="1">
 	    <!-- TMPL_IF name="f7 " -->
-              <option value=" " SELECTED>Sans</option>
+              <option value=" " SELECTED>Aucun</option>
                  <!-- TMPL_ELSE -->
-                    <option value=" ">Sans</option>
+                    <option value=" ">Aucun</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7a" -->
@@ -280,9 +280,9 @@
 		<td>
 			<select name="f8" size="1">
                    <!-- TMPL_IF name="f8 " -->
-                                <option value=" " SELECTED>Sans</option>
+                                <option value=" " SELECTED>Aucun</option>
                         <!-- TMPL_ELSE -->
-                                <option value=" ">Sans</option>
+                                <option value=" ">Aucun</option>
                         <!-- /TMPL_IF -->
 		<!-- TMPL_IF name="f8a" -->
 				<option value="a" SELECTED>Federal/national</option>
@@ -303,7 +303,7 @@
 				<option value="d"
 				SELECTED>local(municipal, etc.)</option>
 			<!-- TMPL_ELSE -->
-				<option value="d">local(municiapal, etc.)</option>
+				<option value="d">local(municipal, etc.)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8e" -->
 				<option value="e"
@@ -364,9 +364,9 @@
 		<td>
 			<select name="f9" size="1">
 	                  <!-- TMPL_IF name="f9 " -->
-                                <option value=" " SELECTED>Sans</option>
+                                <option value=" " SELECTED>Aucun</option>
                         <!-- TMPL_ELSE -->
-                                <option value=" ">Sans</option>
+                                <option value=" ">Aucun</option>
                         <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f90" -->
@@ -398,9 +398,9 @@
 		<td>
 			<select name="f11" size="1">
 	                  <!-- TMPL_IF name="f11 " -->
-                                <option value=" " SELECTED>Sans</option>
+                                <option value=" " SELECTED>Aucun</option>
                         <!-- TMPL_ELSE -->
-                                <option value=" ">Sans</option>
+                                <option value=" ">Aucun</option>
                         <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f11a" -->
@@ -437,9 +437,9 @@
 		<td>
 			<select name="f12" size="1">
 	   <!-- TMPL_IF name="f12  " -->
-                                <option value="  " SELECTED>Sans</option>
+                                <option value="  " SELECTED>Aucun</option>
                         <!-- TMPL_ELSE -->
-                                <option value="  ">Sans</option>
+                                <option value="  ">Aucun</option>
                         <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f1201" -->
@@ -493,9 +493,9 @@
 		<td>
 			<select name="f13" size="1">
 	   <!-- TMPL_IF name="f13  " -->
-                                <option value="  " SELECTED>Sans</option>
+                                <option value="  " SELECTED>Aucun</option>
                         <!-- TMPL_ELSE -->
-                                <option value="  ">Sans</option>
+                                <option value="  ">Aucun</option>
                         <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f1301" -->
@@ -557,9 +557,9 @@
 	<td>
 	<select name="f15" size="1">
 	   <!-- TMPL_IF name="f15  " -->
-                                <option value="  " SELECTED>Sans</option>
+                                <option value="  " SELECTED>Aucun</option>
                         <!-- TMPL_ELSE -->
-                                <option value="  ">Sans</option>
+                                <option value="  ">Aucun</option>
                         <!-- /TMPL_IF -->
 
 	<!-- TMPL_IF name="f15ba" -->
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
index 6196867af7..6e83b96f46 100644
--- 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
@@ -10,9 +10,9 @@
 		<td>
 			<select name="f1" size="1">
 			<!-- TMPL_IF name="f1 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1a" -->
 				<option value="a" SELECTED>Illustrations</option>
@@ -106,9 +106,9 @@
 		<td>
 			<select name="f2" size="1">
 			<!-- TMPL_IF name="f2 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2a" -->
 				<option value="a" SELECTED>Illustrations</option>
@@ -202,9 +202,9 @@
 		<td>
 			<select name="f3" size="1">
 			<!-- TMPL_IF name="f3 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3a" -->
 				<option value="a" SELECTED>Illustrations</option>
@@ -298,9 +298,9 @@
 		<td>
 			<select name="f4" size="1">
 			<!-- TMPL_IF name="f4 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4a" -->
 				<option value="a" SELECTED>Illustrations</option>
@@ -395,9 +395,9 @@
 		<td>
 			<select name="f5" size="1">
 			<!-- TMPL_IF name="f5 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5a" -->
 				<option value="a" SELECTED>Bibliographie</option>
@@ -531,9 +531,9 @@
 		<td>
 			<select name="f6" size="1">
 	<!-- TMPL_IF name="f6 " -->
-										<option value=" " SELECTED>Sans</option>
+										<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6a" -->
@@ -668,9 +668,9 @@
 		<td>
 			<select name="f7" size="1">
 			<!-- TMPL_IF name="f7 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7a" -->
 				<option value="a" SELECTED>Bibliographie</option>
@@ -804,9 +804,9 @@
 		<td>
 			<select name="f8" size="1">
 			<!-- TMPL_IF name="f8 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8a" -->
 				<option value="a" SELECTED>Bibliographie</option>
@@ -943,9 +943,9 @@
                 <td>
                         <select name="f9" size="1">
 	                        <!-- TMPL_IF name="f9 " -->
-                                <option value=" " SELECTED>Sans</option>
+                                <option value=" " SELECTED>Aucun</option>
                         <!-- TMPL_ELSE -->
-                                <option value=" ">Sans</option>
+                                <option value=" ">Aucun</option>
                         <!-- /TMPL_IF -->
 
                         <!-- TMPL_IF name="f90" -->
@@ -973,9 +973,9 @@ n>
                 <td>
                         <select name="f10" size="1">
                         <!-- TMPL_IF name="f10 " -->
-                                <option value=" " SELECTED>Sans</option>
+                                <option value=" " SELECTED>Aucun</option>
                         <!-- TMPL_ELSE -->
-                                <option value=" ">Sans</option>
+                                <option value=" ">Aucun</option>
                         <!-- /TMPL_IF -->
                         <!-- TMPL_IF name="f100" -->
                                 <option value="0"
@@ -1001,9 +1001,9 @@ n>
                 <td>
                         <select name="f11" size="1">
                         <!-- TMPL_IF name="f11 " -->
-                                <option value=" " SELECTED>Sans</option>
+                                <option value=" " SELECTED>Aucun</option>
                         <!-- TMPL_ELSE -->
-                                <option value=" ">Sans</option>
+                                <option value=" ">Aucun</option>
                         <!-- /TMPL_IF -->
 
                         <!-- TMPL_IF name="f110" -->
@@ -1035,9 +1035,9 @@ n>
                 <td>
                         <select name="f12" size="1">
                         <!-- TMPL_IF name="f12 " -->
-                                <option value=" " SELECTED>Sans</option>
+                                <option value=" " SELECTED>Aucun</option>
                         <!-- TMPL_ELSE -->
-                                <option value=" ">Sans</option>
+                                <option value=" ">Aucun</option>
                         <!-- /TMPL_IF -->
 
                         <!-- TMPL_IF name="f12a" -->
@@ -1106,9 +1106,9 @@ n>
 
                         <select name="f13" size="1">
                         <!-- TMPL_IF name="f13 " -->
-                                <option value=" " SELECTED>Sans</option>
+                                <option value=" " SELECTED>Aucun</option>
                         <!-- TMPL_ELSE -->
-                                <option value=" ">Sans</option>
+                                <option value=" ">Aucun</option>
                         <!-- /TMPL_IF -->
                         <!-- TMPL_IF name="f13y" -->
                                 <option value="y"
diff --git a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_106.tmpl b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_106.tmpl
index 2aecd0d7da..81c80508a1 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_106.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_106.tmpl
@@ -10,9 +10,9 @@
 		<td>
 			<select name="f1" size="1">
 	                        <!-- TMPL_IF name="f1 " -->
-                                <option value=" " SELECTED>Sans</option>
+                                <option value=" " SELECTED>Aucun</option>
                         <!-- TMPL_ELSE -->
-                                <option value=" ">Sans</option>
+                                <option value=" ">Aucun</option>
                         <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f1r" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_110.tmpl b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_110.tmpl
index 0655e2a62d..d0bedefcf9 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_110.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_110.tmpl
@@ -10,9 +10,9 @@
 		<td>
 			<select name="f1" size="1">
                         <!-- TMPL_IF name="f1 " -->
-                                <option value=" " SELECTED>Sans</option>
+                                <option value=" " SELECTED>Aucun</option>
                         <!-- TMPL_ELSE -->
-                                <option value=" ">Sans</option>
+                                <option value=" ">Aucun</option>
                         <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f1a" -->
@@ -50,9 +50,9 @@
 		<td>
 			<select name="f2" size="1">
                         <!-- TMPL_IF name="f2 " -->
-                                <option value=" " SELECTED>Sans</option>
+                                <option value=" " SELECTED>Aucun</option>
                         <!-- TMPL_ELSE -->
-                                <option value=" ">Sans</option>
+                                <option value=" ">Aucun</option>
                         <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f2a" -->
@@ -187,9 +187,9 @@
 		<td>
 			<select name="f3" size="1">
                         <!-- TMPL_IF name="f3 " -->
-                                <option value=" " SELECTED>Sans</option>
+                                <option value=" " SELECTED>Aucun</option>
                         <!-- TMPL_ELSE -->
-                                <option value=" ">Sans</option>
+                                <option value=" ">Aucun</option>
                         <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f3u" -->
@@ -227,9 +227,9 @@
 		<td>
 			<select name="f4" size="1">
 	                        <!-- TMPL_IF name="f4 " -->
-                                <option value=" " SELECTED>Sans</option>
+                                <option value=" " SELECTED>Aucun</option>
                         <!-- TMPL_ELSE -->
-                                <option value=" ">Sans</option>
+                                <option value=" ">Aucun</option>
                         <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f4a" -->
@@ -394,9 +394,9 @@
 		<td>
 			<select name="f6" size="1">
 	                        <!-- TMPL_IF name="f6 " -->
-                                <option value=" " SELECTED>Sans</option>
+                                <option value=" " SELECTED>Aucun</option>
                         <!-- TMPL_ELSE -->
-                                <option value=" ">Sans</option>
+                                <option value=" ">Aucun</option>
                         <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f60" -->
@@ -418,9 +418,9 @@
 		<td>
 			<select name="f7" size="1">
 	                        <!-- TMPL_IF name="f7 " -->
-                                <option value=" " SELECTED>Sans</option>
+                                <option value=" " SELECTED>Aucun</option>
                         <!-- TMPL_ELSE -->
-                                <option value=" ">Sans</option>
+                                <option value=" ">Aucun</option>
                         <!-- /TMPL_IF -->
 x
 			<!-- TMPL_IF name="f7a" -->
@@ -504,9 +504,9 @@ x
 		<td>
 			<select name="f8" size="1">
                         <!-- TMPL_IF name="f8 " -->
-                                <option value=" " SELECTED>Sans</option>
+                                <option value=" " SELECTED>Aucun</option>
                         <!-- TMPL_ELSE -->
-                                <option value=" ">Sans</option>
+                                <option value=" ">Aucun</option>
                         <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8a" -->
@@ -634,9 +634,9 @@ x
 		<td>
 			<select name="f9" size="1">
 	       <!-- TMPL_IF name="f9 " -->
-                                <option value=" " SELECTED>Sans</option>
+                                <option value=" " SELECTED>Aucun</option>
                         <!-- TMPL_ELSE -->
-                                <option value=" ">Sans</option>
+                                <option value=" ">Aucun</option>
                         <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f90" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_115a.tmpl b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_115a.tmpl
index 6177adfeb6..aeae29cac0 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_115a.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_115a.tmpl
@@ -10,9 +10,9 @@
 		<td>
 			<select name="f1" size="1">
    <!-- TMPL_IF name="f1 " -->
-                                <option value=" " SELECTED>Sans</option>
+                                <option value=" " SELECTED>Aucun</option>
                         <!-- TMPL_ELSE -->
-                                <option value=" ">Sans</option>
+                                <option value=" ">Aucun</option>
                         <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f1a" -->
@@ -49,9 +49,9 @@
 		<td>
 	<select name="f3" size="1">
    <!-- TMPL_IF name="f3 " -->
-                                <option value=" " SELECTED>Sans</option>
+                                <option value=" " SELECTED>Aucun</option>
                         <!-- TMPL_ELSE -->
-                                <option value=" ">Sans</option>
+                                <option value=" ">Aucun</option>
                         <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f3a" -->
@@ -103,9 +103,9 @@
 		<td>
 			<select name="f4" size="1">
    <!-- TMPL_IF name="f4 " -->
-                                <option value=" " SELECTED>Sans</option>
+                                <option value=" " SELECTED>Aucun</option>
                         <!-- TMPL_ELSE -->
-                                <option value=" ">Sans</option>
+                                <option value=" ">Aucun</option>
                         <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f4a" -->
@@ -143,9 +143,9 @@
 		<td>
 			<select name="f5" size="1">
    <!-- TMPL_IF name="f5 " -->
-                                <option value=" " SELECTED>Sans</option>
+                                <option value=" " SELECTED>Aucun</option>
                         <!-- TMPL_ELSE -->
-                                <option value=" ">Sans</option>
+                                <option value=" ">Aucun</option>
                         <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5a" -->
@@ -249,9 +249,9 @@
 		<td>
 			<select name="f6" size="1">
    <!-- TMPL_IF name="f6 " -->
-                                <option value=" " SELECTED>Sans</option>
+                                <option value=" " SELECTED>Aucun</option>
                         <!-- TMPL_ELSE -->
-                                <option value=" ">Sans</option>
+                                <option value=" ">Aucun</option>
                         <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6a" -->
@@ -426,9 +426,9 @@
 		<td>
 			<select name="f7" size="1">
    <!-- TMPL_IF name="f7 " -->
-                                <option value=" " SELECTED>Sans</option>
+                                <option value=" " SELECTED>Aucun</option>
                         <!-- TMPL_ELSE -->
-                                <option value=" ">Sans</option>
+                                <option value=" ">Aucun</option>
                         <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7a" -->
@@ -540,9 +540,9 @@
 		<td>
 			<select name="f8" size="1">
    <!-- TMPL_IF name="f8 " -->
-                                <option value=" " SELECTED>Sans</option>
+                                <option value=" " SELECTED>Aucun</option>
                         <!-- TMPL_ELSE -->
-                                <option value=" ">Sans</option>
+                                <option value=" ">Aucun</option>
                         <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8a" -->
@@ -595,9 +595,9 @@
 		<td>
 			<select name="f9" size="1">
    <!-- TMPL_IF name="f9 " -->
-                                <option value=" " SELECTED>Sans</option>
+                                <option value=" " SELECTED>Aucun</option>
                         <!-- TMPL_ELSE -->
-                                <option value=" ">Sans</option>
+                                <option value=" ">Aucun</option>
                         <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9a" -->
@@ -671,9 +671,9 @@
 		<td>
 			<select name="f10" size="1">
    <!-- TMPL_IF name="f10 " -->
-                                <option value=" " SELECTED>Sans</option>
+                                <option value=" " SELECTED>Aucun</option>
                         <!-- TMPL_ELSE -->
-                                <option value=" ">Sans</option>
+                                <option value=" ">Aucun</option>
                         <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10a" -->
@@ -744,9 +744,9 @@
 		<td>
 			<select name="f11" size="1">
    <!-- TMPL_IF name="f11 " -->
-                                <option value=" " SELECTED>Sans</option>
+                                <option value=" " SELECTED>Aucun</option>
                         <!-- TMPL_ELSE -->
-                                <option value=" ">Sans</option>
+                                <option value=" ">Aucun</option>
                         <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f11a" -->
@@ -822,9 +822,9 @@
 		<td>
 			<select name="f12" size="1">
    <!-- TMPL_IF name="f12 " -->
-                                <option value=" " SELECTED>Sans</option>
+                                <option value=" " SELECTED>Aucun</option>
                         <!-- TMPL_ELSE -->
-                                <option value=" ">Sans</option>
+                                <option value=" ">Aucun</option>
                         <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f12a" -->
@@ -895,9 +895,9 @@
 		<td>
 			<select name="f13" size="1">
    <!-- TMPL_IF name="f13 " -->
-                                <option value=" " SELECTED>Sans</option>
+                                <option value=" " SELECTED>Aucun</option>
                         <!-- TMPL_ELSE -->
-                                <option value=" ">Sans</option>
+                                <option value=" ">Aucun</option>
                         <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f13a" -->
@@ -971,9 +971,9 @@
 		<td>
 			<select name="f14" size="1">
    <!-- TMPL_IF name="f14 " -->
-                                <option value=" " SELECTED>Sans</option>
+                                <option value=" " SELECTED>Aucun</option>
                         <!-- TMPL_ELSE -->
-                                <option value=" ">Sans</option>
+                                <option value=" ">Aucun</option>
                         <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f14a" -->
@@ -1030,9 +1030,9 @@
 		<td>
 			<select name="f15" size="1">
    <!-- TMPL_IF name="f15 " -->
-                                <option value=" " SELECTED>Sans</option>
+                                <option value=" " SELECTED>Aucun</option>
                         <!-- TMPL_ELSE -->
-                                <option value=" ">Sans</option>
+                                <option value=" ">Aucun</option>
                         <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f15a" -->
@@ -1125,9 +1125,9 @@
 		<td>
 			<select name="f16" size="1">
       <!-- TMPL_IF name="f16 " -->
-                                <option value=" " SELECTED>Sans</option>
+                                <option value=" " SELECTED>Aucun</option>
                         <!-- TMPL_ELSE -->
-                                <option value=" ">Sans</option>
+                                <option value=" ">Aucun</option>
                         <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f16a" -->
@@ -1184,9 +1184,9 @@
 		<td>
 			<select name="f17" size="1">
 			<!-- TMPL_IF name="f17 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f17a" -->
@@ -1261,9 +1261,9 @@
 		<td>
 			<select name="f18" size="1">
 			<!-- TMPL_IF name="f18 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f18a" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_115b.tmpl b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_115b.tmpl
index 9ac352d1aa..70ec09f2da 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_115b.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_115b.tmpl
@@ -10,9 +10,9 @@
 		<td>
 			<select name="f1" size="1">
    <!-- TMPL_IF name="f1 " -->
-                                <option value=" " SELECTED>Sans</option>
+                                <option value=" " SELECTED>Aucun</option>
                         <!-- TMPL_ELSE -->
-                                <option value=" ">Sans</option>
+                                <option value=" ">Aucun</option>
                         <!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1a" -->
 				<option value="a" SELECTED>Original</option>
@@ -63,9 +63,9 @@
 		<td>
 			<select name="f2" size="1">
    <!-- TMPL_IF name="f2 " -->
-                                <option value=" " SELECTED>Sans</option>
+                                <option value=" " SELECTED>Aucun</option>
                         <!-- TMPL_ELSE -->
-                                <option value=" ">Sans</option>
+                                <option value=" ">Aucun</option>
                         <!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2a" -->
 				<option value="a" SELECTED>Epreuve</option>
@@ -137,9 +137,9 @@
 		<td>
 	<select name="f3" size="1">
    <!-- TMPL_IF name="f3 " -->
-                                <option value=" " SELECTED>Sans</option>
+                                <option value=" " SELECTED>Aucun</option>
                         <!-- TMPL_ELSE -->
-                                <option value=" ">Sans</option>
+                                <option value=" ">Aucun</option>
                         <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f3a" -->
@@ -293,9 +293,9 @@
 		<td>
 			<select name="f4" size="1">
    <!-- TMPL_IF name="f4 " -->
-                                <option value=" " SELECTED>Sans</option>
+                                <option value=" " SELECTED>Aucun</option>
                         <!-- TMPL_ELSE -->
-                                <option value=" ">Sans</option>
+                                <option value=" ">Aucun</option>
                         <!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4a" -->
 				<option value="a" SELECTED>Positif</option>
@@ -338,9 +338,9 @@
 		<td>
 			<select name="f5" size="1">
    <!-- TMPL_IF name="f5 " -->
-                                <option value=" " SELECTED>Sans</option>
+                                <option value=" " SELECTED>Aucun</option>
                         <!-- TMPL_ELSE -->
-                                <option value=" ">Sans</option>
+                                <option value=" ">Aucun</option>
                         <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5a" -->
@@ -407,9 +407,9 @@
 		<td>
 			<select name="f6" size="1">
    <!-- TMPL_IF name="f6 " -->
-                                <option value=" " SELECTED>Sans</option>
+                                <option value=" " SELECTED>Aucun</option>
                         <!-- TMPL_ELSE -->
-                                <option value=" ">Sans</option>
+                                <option value=" ">Aucun</option>
                         <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6a" -->
@@ -473,9 +473,9 @@
 		<td>
 			<select name="f7" size="1">
    <!-- TMPL_IF name="f7 " -->
-                                <option value=" " SELECTED>Sans</option>
+                                <option value=" " SELECTED>Aucun</option>
                         <!-- TMPL_ELSE -->
-                                <option value=" ">Sans</option>
+                                <option value=" ">Aucun</option>
                         <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7a" -->
@@ -538,9 +538,9 @@
 		<td>
 			<select name="f8" size="1">
    <!-- TMPL_IF name="f8 " -->
-                                <option value=" " SELECTED>Sans</option>
+                                <option value=" " SELECTED>Aucun</option>
                         <!-- TMPL_ELSE -->
-                                <option value=" ">Sans</option>
+                                <option value=" ">Aucun</option>
                         <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8a" -->
@@ -622,9 +622,9 @@
 		<td>
 			<select name="f9" size="1">
    <!-- TMPL_IF name="f9 " -->
-                                <option value=" " SELECTED>Sans</option>
+                                <option value=" " SELECTED>Aucun</option>
                         <!-- TMPL_ELSE -->
-                                <option value=" ">Sans</option>
+                                <option value=" ">Aucun</option>
                         <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9a" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_116.tmpl b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_116.tmpl
index fc6c192a4e..fae1b43eb2 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_116.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_116.tmpl
@@ -10,9 +10,9 @@
 		<td>
 			<select name="f1" size="1">
 			<!-- TMPL_IF name="f1 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1a" -->
 				<option value="a" SELECTED>Collage</option>
@@ -81,9 +81,9 @@
 		<td>
 			<select name="f2" size="1">
 			<!-- TMPL_IF name="f2 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2a" -->
 				<option value="a" SELECTED>Toile</option>
@@ -197,9 +197,9 @@
 		<td>
 	<select name="f3" size="1">
 			<!-- TMPL_IF name="f3 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f3 " -->
@@ -218,13 +218,13 @@
 
 
 	<tr>
-		<td>Couleur</td>
+		<td>Couleur:</td>
 		<td>
 			<select name="f4" size="1">
 			<!-- TMPL_IF name="f4 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f4a" -->
@@ -286,9 +286,9 @@
 		<td>
 			<select name="f5" size="1">
 			<!-- TMPL_IF name="f5  " -->
-				<option value="  " SELECTED>Sans</option>
+				<option value="  " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value="  ">Sans</option>
+				<option value="  ">Aucun</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5aa" -->
@@ -341,7 +341,7 @@
 			<!-- TMPL_IF name="f5ah" -->
 				<option value="ah" SELECTED>Craie noire</option>
 			<!-- TMPL_ELSE -->
-				<option value="ah">Craie nore</option>
+				<option value="ah">Craie noire</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5ai" -->
@@ -486,9 +486,9 @@
 		<td>
 			<select name="f6" size="1">
 			<!-- TMPL_IF name="f6  " -->
-				<option value="  " SELECTED>Sans</option>
+				<option value="  " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value="  ">Sans</option>
+				<option value="  ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6aa" -->
 				<option value="aa" SELECTED>Crayon</option>
@@ -540,7 +540,7 @@
 			<!-- TMPL_IF name="f6ah" -->
 				<option value="ah" SELECTED>Craie noire</option>
 			<!-- TMPL_ELSE -->
-				<option value="ah">Craie nore</option>
+				<option value="ah">Craie noire</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6ai" -->
@@ -685,9 +685,9 @@
 		<td>
 			<select name="f7" size="1">
 			<!-- TMPL_IF name="f7  " -->
-				<option value="  " SELECTED>Sans</option>
+				<option value="  " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value="  ">Sans</option>
+				<option value="  ">Aucun</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7aa" -->
@@ -740,7 +740,7 @@
 			<!-- TMPL_IF name="f7ah" -->
 				<option value="ah" SELECTED>Craie noire</option>
 			<!-- TMPL_ELSE -->
-				<option value="ah">Craie nore</option>
+				<option value="ah">Craie noire</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7ai" -->
@@ -891,9 +891,9 @@
 		<td>
 			<select name="f8" size="1">
 			<!-- TMPL_IF name="f8  " -->
-				<option value="  " SELECTED>Sans</option>
+				<option value="  " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value="  ">Sans</option>
+				<option value="  ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8ba" -->
 				<option value="ba" SELECTED>Gravure sur bois</option>
@@ -1086,9 +1086,9 @@
 		<td>
 			<select name="f9" size="1">
 			<!-- TMPL_IF name="f9  " -->
-				<option value="  " SELECTED>Sans</option>
+				<option value="  " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value="  ">Sans</option>
+				<option value="  ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9ba" -->
 				<option value="ba" SELECTED>Gravure sur bois</option>
@@ -1281,9 +1281,9 @@
 		<td>
 			<select name="f10" size="1">
 			<!-- TMPL_IF name="f10  " -->
-				<option value="  " SELECTED>Sans</option>
+				<option value="  " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value="  ">Sans</option>
+				<option value="  ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10ba" -->
 				<option value="ba" SELECTED>Gravure sur bois</option>
@@ -1478,9 +1478,9 @@
 		<td>
 			<select name="f11" size="1">
 			<!-- TMPL_IF name="f11  " -->
-				<option value="  " SELECTED>Sans</option>
+				<option value="  " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value="  ">Sans</option>
+				<option value="  ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11aa" -->
 				<option value="aa" SELECTED>Dessin architectural</option>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_117.tmpl b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_117.tmpl
index 996ab04faa..3b3c888b11 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_117.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_117.tmpl
@@ -10,9 +10,9 @@
 		<td>
 			<select name="f1" size="1">
 			<!-- TMPL_IF name="f1  " -->
-				<option value="  " SELECTED>Sans</option>
+				<option value="  " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value="  ">Sans</option>
+				<option value="  ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1aa" -->
 				<option value="aa" SELECTED>Trousse pedagogique</option>
@@ -221,9 +221,9 @@
 		<td>
 			<select name="f2" size="1">
 			<!-- TMPL_IF name="f2  " -->
-				<option value="  " SELECTED>Sans</option>
+				<option value="  " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value="  ">Sans</option>
+				<option value="  ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2aa" -->
 				<option value="aa" SELECTED>Terre cuite</option>
@@ -394,9 +394,9 @@
 		<td>
 			<select name="f3" size="1">
 			<!-- TMPL_IF name="f3  " -->
-				<option value="  " SELECTED>Sans</option>
+				<option value="  " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value="  ">Sans</option>
+				<option value="  ">Aucun</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f3aa" -->
@@ -568,9 +568,9 @@
 		<td>
 			<select name="f4" size="1">
 			<!-- TMPL_IF name="f4  " -->
-				<option value="  " SELECTED>Sans</option>
+				<option value="  " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value="  ">Sans</option>
+				<option value="  ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4aa" -->
 				<option value="aa" SELECTED>Terre cuite</option>
@@ -744,9 +744,9 @@
 		<td>
 	<select name="f5" size="1">
 			<!-- TMPL_IF name="f5 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5a" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_120.tmpl b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_120.tmpl
index 4bb287eb62..4318a663a7 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_120.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_120.tmpl
@@ -10,9 +10,9 @@
 		<td>
 			<select name="f1" size="1">
 			<!-- TMPL_IF name="f1 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1a" -->
 				<option value="a" SELECTED>Monochrome</option>
@@ -30,9 +30,9 @@
 		<td>
 			<select name="f2" size="1">
 			<!-- TMPL_IF name="f2 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2a" -->
 				<option value="a" SELECTED>Index ou
@@ -72,9 +72,9 @@
 		<td>
 			<select name="f3" size="1">
 			<!-- TMPL_IF name="f3 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3a" -->
 				<option value="a" SELECTED>Texte sur
@@ -103,9 +103,9 @@
 		<td>
 			<select name="f4" size="1">
 			<!-- TMPL_IF name="f4 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4a" -->
 				<option value="a" SELECTED>Courbes de niveau</option>
@@ -188,9 +188,9 @@
 		<td>
 			<select name="f5" size="1">
 			<!-- TMPL_IF name="f5 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5a" -->
 				<option value="a" SELECTED>Courbes de niveau</option>
@@ -273,9 +273,9 @@
 		<td>
 			<select name="f6" size="1">
 			<!-- TMPL_IF name="f6 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6a" -->
 				<option value="a" SELECTED>Courbes de niveau</option>
@@ -358,9 +358,9 @@
 		<td>
 			<select name="f7" size="1">
 			<!-- TMPL_IF name="f7 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7a" -->
 				<option value="a" SELECTED>Courbes de niveau</option>
@@ -443,9 +443,9 @@
 		<td>
 			<select name="f8" size="1">
 			<!-- TMPL_IF name="f8  " -->
-				<option value="  " SELECTED>Sans</option>
+				<option value="  " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value="  ">Sans</option>
+				<option value="  ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8aa" -->
 				<option value="aa" SELECTED>Aitoff</option>
@@ -776,9 +776,9 @@
 		<td>
 			<select name="f9" size="1">
 	<!-- TMPL_IF name="f9  " -->
-										<option value="  " SELECTED>Sans</option>
+										<option value="  " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value="  ">Sans</option>
+				<option value="  ">Aucun</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9aa" -->
@@ -1051,9 +1051,9 @@
 		<td>
 			<select name="f10" size="1">
 	<!-- TMPL_IF name="f10  " -->
-										<option value="  " SELECTED>Sans</option>
+										<option value="  " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10aa" -->
diff --git a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_121a.tmpl b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_121a.tmpl
index 88af7c2df4..fb60800ec4 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_121a.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_121a.tmpl
@@ -10,9 +10,9 @@
 		<td>
 			<select name="f1" size="1">
 			<!-- TMPL_IF name="f1 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1a" -->
 				<option value="a" SELECTED>Bi-dimensionnel</option>
@@ -30,9 +30,9 @@
 		<td>
 			<select name="f2" size="1">
 			<!-- TMPL_IF name="f2 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2a" -->
 				<option value="a" SELECTED>Manuelle et
@@ -52,14 +52,14 @@
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2d" -->
 				<option value="d" SELECTED>Par
-				techique de teledetection active</option>
+				technique de teledetection active</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">Par technique de
 				teledetection active</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2e" -->
 				<option value="e" SELECTED>Par
-				techique de teledetection passive</option>
+				technique de teledetection passive</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">Par technique de
 				teledetection passive</option>
@@ -69,9 +69,9 @@
 		<td>
 			<select name="f3" size="1">
 			<!-- TMPL_IF name="f3 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3a" -->
 				<option value="a" SELECTED>Manuelle et
@@ -91,14 +91,14 @@
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3d" -->
 				<option value="d" SELECTED>Par
-				techique de teledetection active</option>
+				technique de teledetection active</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">Par technique de
 				teledetection active</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3e" -->
 				<option value="e" SELECTED>Par
-				techique de teledetection passive</option>
+				technique de teledetection passive</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">Par technique de
 				teledetection passive</option>
@@ -109,9 +109,9 @@
 		<td>
 			<select name="f4" size="1">
 			<!-- TMPL_IF name="f4  " -->
-				<option value="  " SELECTED>Sans</option>
+				<option value="  " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value="  ">Sans</option>
+				<option value="  ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4aa" -->
 				<option value="aa" SELECTED>Papier</option>
@@ -227,9 +227,9 @@
 		<td>
 			<select name="f5" size="1">
 			<!-- TMPL_IF name="f5 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5a" -->
 				<option value="a" SELECTED>Manuscrit</option>
@@ -275,9 +275,9 @@
 		<td>
 			<select name="f6" size="1">
 			<!-- TMPL_IF name="f6 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6a" -->
 				<option value="a" SELECTED>Manuscrit</option>
@@ -313,9 +313,9 @@
 		<td>
 			<select name="f7" size="1">
 			<!-- TMPL_IF name="f7 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7a" -->
 				<option value="a" SELECTED>Pas de repere</option>
@@ -349,9 +349,9 @@
 		<td>
 			<select name="f8" size="1">
 			<!-- TMPL_IF name="f8 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8a" -->
 				<option value="a" SELECTED>Publication
diff --git a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_121b.tmpl b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_121b.tmpl
index 56c63406ad..f7ec367e40 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_121b.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_121b.tmpl
@@ -10,9 +10,9 @@
 		<td>
 			<select name="f1" size="1">
 			<!-- TMPL_IF name="f1 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1a" -->
 				<option value="a" SELECTED>Terrestre</option>
@@ -35,9 +35,9 @@
 		<td>
 			<select name="f2" size="1">
 			<!-- TMPL_IF name="f2 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2a" -->
 				<option value="a" SELECTED>Oblique faible</option>
@@ -64,9 +64,9 @@
 		<td>
 			<select name="f4" size="1">
 			<!-- TMPL_IF name="f4 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4a" -->
 				<option value="a" SELECTED>Faible</option>
@@ -94,9 +94,9 @@
 		<td>
 			<select name="f5" size="1">
 			<!-- TMPL_IF name="f5 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f51" -->
 				<option value="1" SELECTED>1/8</option>
@@ -146,9 +146,9 @@
                         <select name="f6" size="1">
                         <!-- TMPL_IF name="f6 " -->
                                 <option value=" "
-                SELECTED>Sans</option>
+                SELECTED>Aucun</option>
                         <!-- TMPL_ELSE -->
-                                <option value=" ">Sans</option>
+                                <option value=" ">Aucun</option>
                         <!-- /TMPL_IF -->
                         <!-- TMPL_IF name="f6-" -->
                                 <option value="-"
@@ -226,9 +226,9 @@
                 
 			<select name="f7" size="1">
 			<!-- TMPL_IF name="f7 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7c" -->
 				<option value="c" SELECTED>Centimetres</option>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_122.tmpl b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_122.tmpl
index b2daafe109..6fbea27a62 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_122.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_122.tmpl
@@ -10,9 +10,9 @@
 		<td>
 			<select name="f1" size="1">
 			<!-- TMPL_IF name="f1 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1c" -->
 				<option value="c" SELECTED>La date
diff --git a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_123a.tmpl b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_123a.tmpl
index 9b14f97f92..3f87a868bd 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_123a.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_123a.tmpl
@@ -10,9 +10,9 @@
 		<td>
 			<select name="f1" size="1">
 			<!-- TMPL_IF name="f1 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1a" -->
 				<option value="a" SELECTED>Echelle lineaire</option>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_123d.tmpl b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_123d.tmpl
index 729f629158..6388a0519c 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_123d.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_123d.tmpl
@@ -10,9 +10,9 @@
 		<td>
 			<select name="f1" size="1">
 			<!-- TMPL_IF name="f1 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1w" -->
 				<option value="w" SELECTED>Ouest</option>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_123e.tmpl b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_123e.tmpl
index e7dd443020..9acc8eb4b4 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_123e.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_123e.tmpl
@@ -10,9 +10,9 @@
 		<td>
 			<select name="f1" size="1">
 			<!-- TMPL_IF name="f1 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1w" -->
 				<option value="w" SELECTED>Ouest</option>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_123f.tmpl b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_123f.tmpl
index d21304230b..05a04e0d8b 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_123f.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_123f.tmpl
@@ -10,9 +10,9 @@
 		<td>
 			<select name="f1" size="1">
 			<!-- TMPL_IF name="f1 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1w" -->
 				<option value="w" SELECTED>Ouest</option>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_123g.tmpl b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_123g.tmpl
index a22cb07f2a..05f25889ac 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_123g.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_123g.tmpl
@@ -10,9 +10,9 @@
 		<td>
 			<select name="f1" size="1">
 			<!-- TMPL_IF name="f1 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1w" -->
 				<option value="w" SELECTED>Ouest</option>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_124a.tmpl b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_124a.tmpl
index 2382ab0e4e..eb5e150f51 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_124a.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_124a.tmpl
@@ -10,9 +10,9 @@
 		<td>
 			<select name="f1" size="1">
 			<!-- TMPL_IF name="f1 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1a" -->
 				<option value="a" SELECTED>Image non-photographique</option>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_124b.tmpl b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_124b.tmpl
index 28855861de..01fa9e06cd 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_124b.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_124b.tmpl
@@ -10,9 +10,9 @@
 		<td>
 			<select name="f1" size="1">
 			<!-- TMPL_IF name="f1 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1a" -->
 				<option value="a" SELECTED>Atlas</option>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_124c.tmpl b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_124c.tmpl
index 6a53fd2b97..10cd3b95c0 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_124c.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_124c.tmpl
@@ -10,9 +10,9 @@
 		<td>
 			<select name="f1" size="1">
 			<!-- TMPL_IF name="f1  " -->
-				<option value="  " SELECTED>Sans</option>
+				<option value="  " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value="  ">Sans</option>
+				<option value="  ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1aa" -->
 				<option value="aa" SELECTED>Anaglyphique</option>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_124d.tmpl b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_124d.tmpl
index 9aa836eaa9..1ae2b71559 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_124d.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_124d.tmpl
@@ -10,9 +10,9 @@
 		<td>
 			<select name="f1" size="1">
 			<!-- TMPL_IF name="f1 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1a" -->
 				<option value="a" SELECTED>Terrestre</option>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_124e.tmpl b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_124e.tmpl
index b54deb75c7..e8558c8c44 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_124e.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_124e.tmpl
@@ -10,9 +10,9 @@
 		<td>
 			<select name="f1" size="1">
 			<!-- TMPL_IF name="f1 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1a" -->
 				<option value="a" SELECTED>Meteorologique</option>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_124f.tmpl b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_124f.tmpl
index 522684e484..0a80ac763c 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_124f.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_124f.tmpl
@@ -10,9 +10,9 @@
 		<td>
 			<select name="f1" size="1">
 			<!-- TMPL_IF name="f1  " -->
-				<option value="  " SELECTED>Sans</option>
+				<option value="  " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value="  ">Sans</option>
+				<option value="  ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1aa" -->
 				<option value="aa" SELECTED>Tiros</option>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_124g.tmpl b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_124g.tmpl
index 8b74c08b5e..8ffdd60bab 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_124g.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_124g.tmpl
@@ -10,9 +10,9 @@
 		<td>
 			<select name="f1" size="1">
 			<!-- TMPL_IF name="f1  " -->
-				<option value="  " SELECTED>Sans</option>
+				<option value="  " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value="  ">Sans</option>
+				<option value="  ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1aa" -->
 				<option value="aa" SELECTED>Enregistrement video</option>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_125a.tmpl b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_125a.tmpl
index 1a14b0abae..b9a5451081 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_125a.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_125a.tmpl
@@ -10,9 +10,9 @@
 		<td>
 			<select name="f1" size="1">
 			<!-- TMPL_IF name="f1 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1a" -->
 				<option value="a" SELECTED>Partition d'orchestre</option>
@@ -71,9 +71,9 @@
 		<td>
 			<select name="f2" size="1">
 			<!-- TMPL_IF name="f2 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2a" -->
 				<option value="a" SELECTED>Parties existantes</option>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_125b.tmpl b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_125b.tmpl
index 315dd8e734..a7678f65ac 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_125b.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_125b.tmpl
@@ -10,9 +10,9 @@
 		<td>
 			<select name="f1" size="1">
 			<!-- TMPL_IF name="f1 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1a" -->
 				<option value="a" SELECTED>Poesie</option>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_126a.tmpl b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_126a.tmpl
index 5673a59338..9ad72b5844 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_126a.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_126a.tmpl
@@ -10,9 +10,9 @@
 		<td>
 			<select name="f1" size="1">
 			<!-- TMPL_IF name="f1 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1a" -->
 				<option value="a" SELECTED>Disque</option>
@@ -66,9 +66,9 @@
 		<td>
 			<select name="f2" size="1">
 			<!-- TMPL_IF name="f2 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2u" -->
 				<option value="u" SELECTED>Inconnu</option>
@@ -172,9 +172,9 @@
 		<td>
 			<select name="f3" size="1">
 			<!-- TMPL_IF name="f3 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3a" -->
 				<option value="a" SELECTED>Monaural</option>
@@ -208,9 +208,9 @@
 		<td>
 			<select name="f4" size="1">
 			<!-- TMPL_IF name="f4 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4a" -->
 				<option value="a" SELECTED>Large/standard</option>
@@ -244,9 +244,9 @@
 		<td>
 			<select name="f5" size="1">
 			<!-- TMPL_IF name="f5 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5a" -->
 				<option value="a" SELECTED>7.62cm ou 3 pouces</option>
@@ -325,9 +325,9 @@
 		<td>
 			<select name="f6" size="1">
 			<!-- TMPL_IF name="f6 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6a" -->
 				<option value="a" SELECTED>1/4 de pouce</option>
@@ -381,9 +381,9 @@
 		<td>
 			<select name="f7" size="1">
 			<!-- TMPL_IF name="f7 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7a" -->
 				<option value="a" SELECTED>Pleine piste</option>
@@ -447,9 +447,9 @@
 		<td>
 			<select name="f8" size="1">
 			<!-- TMPL_IF name="f8 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8a" -->
 				<option value="a" SELECTED>Discographie</option>
@@ -489,7 +489,7 @@
 			<!-- TMPL_IF name="f8h" -->
 				<option value="h" SELECTED>Renseignements techniques sur la musique</option>
 			<!-- TMPL_ELSE -->
-				<option value="h">Renseignement techniques sur la musique</option>
+				<option value="h">Renseignements techniques sur la musique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8i" -->
 				<option value="i" SELECTED>Renseignements historiques sur la musique</option>
@@ -497,7 +497,7 @@
 				<option value="i">Renseignements historiques sur la musique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8j" -->
-				<option value="j" SELECTED>Autres renseignements hitoriques</option>
+				<option value="j" SELECTED>Autres renseignements historiques</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">Autres renseignements historiques</option>
 			<!-- /TMPL_IF -->
@@ -533,9 +533,9 @@
 		<td>
 			<select name="f9" size="1">
 			<!-- TMPL_IF name="f9 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9a" -->
 				<option value="a" SELECTED>Discographie</option>
@@ -575,7 +575,7 @@
 			<!-- TMPL_IF name="f9h" -->
 				<option value="h" SELECTED>Renseignements techniques sur la musique</option>
 			<!-- TMPL_ELSE -->
-				<option value="h">Renseignement techniques sur la musique</option>
+				<option value="h">Renseignements techniques sur la musique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9i" -->
 				<option value="i" SELECTED>Renseignements historiques sur la musique</option>
@@ -583,7 +583,7 @@
 				<option value="i">Renseignements historiques sur la musique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9j" -->
-				<option value="j" SELECTED>Autres renseignements hitoriques</option>
+				<option value="j" SELECTED>Autres renseignements historiques</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">Autres renseignements historiques</option>
 			<!-- /TMPL_IF -->
@@ -619,9 +619,9 @@
 		<td>
 			<select name="f10" size="1">
 			<!-- TMPL_IF name="f10 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10a" -->
 				<option value="a" SELECTED>Discographie</option>
@@ -661,7 +661,7 @@
 			<!-- TMPL_IF name="f10h" -->
 				<option value="h" SELECTED>Renseignements techniques sur la musique</option>
 			<!-- TMPL_ELSE -->
-				<option value="h">Renseignement techniques sur la musique</option>
+				<option value="h">Renseignements techniques sur la musique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10i" -->
 				<option value="i" SELECTED>Renseignements historiques sur la musique</option>
@@ -669,7 +669,7 @@
 				<option value="i">Renseignements historiques sur la musique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10j" -->
-				<option value="j" SELECTED>Autres renseignements hitoriques</option>
+				<option value="j" SELECTED>Autres renseignements historiques</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">Autres renseignements historiques</option>
 			<!-- /TMPL_IF -->
@@ -705,9 +705,9 @@
 		<td>
 			<select name="f11" size="1">
 			<!-- TMPL_IF name="f11 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11a" -->
 				<option value="a" SELECTED>Discographie</option>
@@ -747,7 +747,7 @@
 			<!-- TMPL_IF name="f11h" -->
 				<option value="h" SELECTED>Renseignements techniques sur la musique</option>
 			<!-- TMPL_ELSE -->
-				<option value="h">Renseignement techniques sur la musique</option>
+				<option value="h">Renseignements techniques sur la musique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11i" -->
 				<option value="i" SELECTED>Renseignements historiques sur la musique</option>
@@ -755,7 +755,7 @@
 				<option value="i">Renseignements historiques sur la musique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11j" -->
-				<option value="j" SELECTED>Autres renseignements hitoriques</option>
+				<option value="j" SELECTED>Autres renseignements historiques</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">Autres renseignements historiques</option>
 			<!-- /TMPL_IF -->
@@ -791,9 +791,9 @@
 		<td>
 			<select name="f12" size="1">
 			<!-- TMPL_IF name="f12 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12a" -->
 				<option value="a" SELECTED>Discographie</option>
@@ -833,7 +833,7 @@
 			<!-- TMPL_IF name="f12h" -->
 				<option value="h" SELECTED>Renseignements techniques sur la musique</option>
 			<!-- TMPL_ELSE -->
-				<option value="h">Renseignement techniques sur la musique</option>
+				<option value="h">Renseignements techniques sur la musique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12i" -->
 				<option value="i" SELECTED>Renseignements historiques sur la musique</option>
@@ -841,7 +841,7 @@
 				<option value="i">Renseignements historiques sur la musique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12j" -->
-				<option value="j" SELECTED>Autres renseignements hitoriques</option>
+				<option value="j" SELECTED>Autres renseignements historiques</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">Autres renseignements historiques</option>
 			<!-- /TMPL_IF -->
@@ -877,9 +877,9 @@
 		<td>
 			<select name="f13" size="1">
 			<!-- TMPL_IF name="f13 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13a" -->
 				<option value="a" SELECTED>Discographie</option>
@@ -919,7 +919,7 @@
 			<!-- TMPL_IF name="f13h" -->
 				<option value="h" SELECTED>Renseignements techniques sur la musique</option>
 			<!-- TMPL_ELSE -->
-				<option value="h">Renseignement techniques sur la musique</option>
+				<option value="h">Renseignements techniques sur la musique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13i" -->
 				<option value="i" SELECTED>Renseignements historiques sur la musique</option>
@@ -927,7 +927,7 @@
 				<option value="i">Renseignements historiques sur la musique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13j" -->
-				<option value="j" SELECTED>Autres renseignements hitoriques</option>
+				<option value="j" SELECTED>Autres renseignements historiques</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">Autres renseignements historiques</option>
 			<!-- /TMPL_IF -->
@@ -963,9 +963,9 @@
 		<td>
 			<select name="f14" size="1">
 			<!-- TMPL_IF name="f14 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14a" -->
 				<option value="a" SELECTED>Acoustique</option>
@@ -999,9 +999,9 @@
 		<td>
 			<select name="f15" size="1">
 			<!-- TMPL_IF name="f15 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15a" -->
 				<option value="a" SELECTED>Norme NAB</option>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_126b.tmpl b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_126b.tmpl
index ca50a3aa28..e588e8593f 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_126b.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_126b.tmpl
@@ -10,9 +10,9 @@
 		<td>
 			<select name="f1" size="1">
 			<!-- TMPL_IF name="f1 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1a" -->
 				<option value="a" SELECTED>Gravure directe</option>
@@ -71,9 +71,9 @@
 		<td>
 			<select name="f2" size="1">
 			<!-- TMPL_IF name="f2 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2u" -->
 				<option value="u" SELECTED>Inconnu</option>
@@ -152,9 +152,9 @@
 		<td>
 			<select name="f3" size="1">
 			<!-- TMPL_IF name="f3 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3a" -->
 				<option value="a" SELECTED>Gravure laterale ou combinee</option>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_128a.tmpl b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_128a.tmpl
index 52a4f9b558..0c30a26056 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_128a.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_128a.tmpl
@@ -10,9 +10,9 @@
 		<td>
 			<select name="f1" size="1">
 			<!-- TMPL_IF name="f1  " -->
-				<option value="  " SELECTED>Sans</option>
+				<option value="  " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value="  ">Sans</option>
+				<option value="  ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ai" -->
 				<option value="ai" SELECTED>Airs</option>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_128b.tmpl b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_128b.tmpl
index b3d9b7b74c..eb288879cb 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_128b.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_128b.tmpl
@@ -10,9 +10,9 @@
 		<td>
 			<select name="f1" size="1">
 			<!-- TMPL_IF name="f1  " -->
-				<option value="  " SELECTED>Sans</option>
+				<option value="  " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value="  ">Sans</option>
+				<option value="  ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ba" -->
 				<option value="ba" SELECTED>Cor</option>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_128c.tmpl b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_128c.tmpl
index 6873b4d003..fee8c4846f 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_128c.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_128c.tmpl
@@ -10,9 +10,9 @@
 		<td>
 			<select name="f1" size="1">
 			<!-- TMPL_IF name="f1  " -->
-				<option value="  " SELECTED>Sans</option>
+				<option value="  " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value="  ">Sans</option>
+				<option value="  ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ba" -->
 				<option value="ba" SELECTED>Cor</option>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_130.tmpl b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_130.tmpl
index 6b486e3680..f2fba6a1fc 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_130.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_130.tmpl
@@ -10,9 +10,9 @@
 		<td>
 			<select name="f1" size="1">
 			<!-- TMPL_IF name="f1 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1a" -->
 				<option value="a" SELECTED>Carte a fenetre</option>
@@ -66,9 +66,9 @@
 		<td>
 			<select name="f2" size="1">
 			<!-- TMPL_IF name="f2 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2a" -->
 				<option value="a" SELECTED>Positif</option>
@@ -97,9 +97,9 @@
 		<td>
 			<select name="f3" size="1">
 			<!-- TMPL_IF name="f3 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3a" -->
 				<option value="a" SELECTED>8 mm (microfilm)</option>
@@ -163,9 +163,9 @@
 		<td>
 			<select name="f4" size="1">
 			<!-- TMPL_IF name="f4 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4a" -->
 				<option value="a" SELECTED>Faible reduction</option>
@@ -216,9 +216,9 @@ value="<!-- TMPL_VAR name="f5" -->"></td>
 		<td>
 			<select name="f6" size="1">
 			<!-- TMPL_IF name="f6 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6a" -->
 				<option value="a" SELECTED>Monochrome</option>
@@ -247,9 +247,9 @@ value="<!-- TMPL_VAR name="f5" -->"></td>
 		<td>
 			<select name="f7" size="1">
 			<!-- TMPL_IF name="f7 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7a" -->
 				<option value="a" SELECTED>Sel d'argent</option>
@@ -293,9 +293,9 @@ value="<!-- TMPL_VAR name="f5" -->"></td>
 		<td>
 			<select name="f8" size="1">
 			<!-- TMPL_IF name="f8 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8a" -->
 				<option value="a" SELECTED>Premiere generation (master)</option>
@@ -329,9 +329,9 @@ value="<!-- TMPL_VAR name="f5" -->"></td>
 		<td>
 			<select name="f9" size="1">
 			<!-- TMPL_IF name="f9 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9a" -->
 				<option value="a" SELECTED>Support de securite</option>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_135a.tmpl b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_135a.tmpl
index fcb33f3d8a..b726e0297e 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_135a.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_135a.tmpl
@@ -10,9 +10,9 @@
 		<td>
 			<select name="f1" size="1">
 			<!-- TMPL_IF name="f1 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1a" -->
 				<option value="a" SELECTED>Donnees numeriques</option>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_140.tmpl b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_140.tmpl
index c1a1cacf7e..e3da849e26 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_140.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_140.tmpl
@@ -10,9 +10,9 @@
 		<td>
 			<select name="f1" size="1">
 			<!-- TMPL_IF name="f1 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1a" -->
 				<option value="a" SELECTED>Illustrations</option>
@@ -104,9 +104,9 @@
 		<td>
 			<select name="f2" size="1">
 			<!-- TMPL_IF name="f2 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2a" -->
 				<option value="a" SELECTED>Illustrations</option>
@@ -198,9 +198,9 @@
 		<td>
 			<select name="f3" size="1">
 			<!-- TMPL_IF name="f3 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3a" -->
 				<option value="a" SELECTED>Illustrations</option>
@@ -292,9 +292,9 @@
 		<td>
 			<select name="f4" size="1">
 			<!-- TMPL_IF name="f4 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4a" -->
 				<option value="a" SELECTED>Illustrations</option>
@@ -387,9 +387,9 @@
 		<td>
 			<select name="f5" size="1">
 			<!-- TMPL_IF name="f5 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5a" -->
 				<option value="a" SELECTED>Illustrations</option>
@@ -456,9 +456,9 @@
 		<td>
 			<select name="f6" size="1">
 			<!-- TMPL_IF name="f6 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6a" -->
 				<option value="a" SELECTED>Illustrations</option>
@@ -526,9 +526,9 @@
 		<td>
 			<select name="f7" size="1">
 			<!-- TMPL_IF name="f7 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7a" -->
 				<option value="a" SELECTED>Illustrations</option>
@@ -595,9 +595,9 @@
 		<td>
 			<select name="f8" size="1">
 			<!-- TMPL_IF name="f8 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8a" -->
 				<option value="a" SELECTED>Illustrations</option>
@@ -664,9 +664,9 @@
 		<td>
 			<select name="f9" size="1">
 			<!-- TMPL_IF name="f9 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9a" -->
 				<option value="a" SELECTED>Gravure</option>
@@ -713,9 +713,9 @@
 		<td>
 			<select name="f10" size="1">
 			<!-- TMPL_IF name="f10  " -->
-				<option value="  " SELECTED>Sans</option>
+				<option value="  " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value="  ">Sans</option>
+				<option value="  ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10aa" -->
 				<option value="aa" SELECTED>Ouvrage religieux</option>
@@ -867,9 +867,9 @@
 		<td>
 			<select name="f11" size="1">
 			<!-- TMPL_IF name="f11  " -->
-				<option value="  " SELECTED>Sans</option>
+				<option value="  " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value="  ">Sans</option>
+				<option value="  ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11aa" -->
 				<option value="aa" SELECTED>Ouvrage religieux</option>
@@ -1021,9 +1021,9 @@
 		<td>
 			<select name="f12" size="1">
 			<!-- TMPL_IF name="f12  " -->
-				<option value="  " SELECTED>Sans</option>
+				<option value="  " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value="  ">Sans</option>
+				<option value="  ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12aa" -->
 				<option value="aa" SELECTED>Ouvrage religieux</option>
@@ -1175,9 +1175,9 @@
 		<td>
 			<select name="f13" size="1">
 			<!-- TMPL_IF name="f13  " -->
-				<option value="  " SELECTED>Sans</option>
+				<option value="  " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value="  ">Sans</option>
+				<option value="  ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13aa" -->
 				<option value="aa" SELECTED>Ouvrage religieux</option>
@@ -1329,9 +1329,9 @@
 		<td>
 			<select name="f14" size="1">
 			<!-- TMPL_IF name="f14  " -->
-				<option value="  " SELECTED>Sans</option>
+				<option value="  " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value="  ">Sans</option>
+				<option value="  ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14aa" -->
 				<option value="aa" SELECTED>Poesie</option>
@@ -1489,9 +1489,9 @@
 		<td>
 			<select name="f15" size="1">
 			<!-- TMPL_IF name="f15 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15a" -->
 				<option value="a" SELECTED>Autobiographie</option>
@@ -1531,9 +1531,9 @@
 		<td>
 			<select name="f16" size="1">
 			<!-- TMPL_IF name="f16 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f16a" -->
 				<option value="a" SELECTED>Papier, en general</option>
@@ -1573,9 +1573,9 @@
 		<td>
 			<select name="f17" size="1">
 			<!-- TMPL_IF name="f17 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f17a" -->
 				<option value="a" SELECTED>Papier, en general</option>
@@ -1615,9 +1615,9 @@
 		<td>
 			<select name="f18" size="1">
 			<!-- TMPL_IF name="f18 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f180" -->
 				<option value="0" SELECTED>Pas de filigrane</option>
@@ -1637,9 +1637,9 @@
 		<td>
 			<select name="f19" size="1">
 			<!-- TMPL_IF name="f19 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f190" -->
 				<option value="0" SELECTED>Pas de marque d'imprimeur</option>
@@ -1659,9 +1659,9 @@
 		<td>
 			<select name="f20" size="1">
 			<!-- TMPL_IF name="f20 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f200" -->
 				<option value="0" SELECTED>Pas de marque d'editeur</option>
@@ -1681,9 +1681,9 @@
 		<td>
 			<select name="f21" size="1">
 			<!-- TMPL_IF name="f21 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f210" -->
 				<option value="0" SELECTED>Pas de marque decorative</option>
diff --git a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_141.tmpl b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_141.tmpl
index 5132f71543..b6cfa48859 100644
--- a/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_141.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_141.tmpl
@@ -10,9 +10,9 @@
 		<td>
 			<select name="f1" size="1">
 			<!-- TMPL_IF name="f1 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1a" -->
 				<option value="a" SELECTED>Parchemin, velin</option>
@@ -65,9 +65,9 @@
 		<td>
 			<select name="f2" size="1">
 			<!-- TMPL_IF name="f2 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2a" -->
 				<option value="a" SELECTED>Parchemin, velin</option>
@@ -120,9 +120,9 @@
 		<td>
 			<select name="f3" size="1">
 			<!-- TMPL_IF name="f3 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3a" -->
 				<option value="a" SELECTED>Parchemin, velin</option>
@@ -175,9 +175,9 @@
 		<td>
 			<select name="f4" size="1">
 			<!-- TMPL_IF name="f4 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4a" -->
 				<option value="a" SELECTED>Originale</option>
@@ -224,9 +224,9 @@
 		<td>
 			<select name="f5" size="1">
 			<!-- TMPL_IF name="f5 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f50" -->
 				<option value="0" SELECTED>Relie seul</option>
@@ -243,9 +243,9 @@
 		<td>
 			<select name="f6" size="1">
 			<!-- TMPL_IF name="f6 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6a" -->
 				<option value="a" SELECTED>Excellent</option>
@@ -287,9 +287,9 @@
 		<td>
 			<select name="f7" size="1">
 			<!-- TMPL_IF name="f7 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7a" -->
 				<option value="a" SELECTED>Excellent</option>
@@ -331,9 +331,9 @@
 		<td>
 			<select name="f8" size="1">
 			<!-- TMPL_IF name="f8 " -->
-				<option value=" " SELECTED>Sans</option>
+				<option value=" " SELECTED>Aucun</option>
 			<!-- TMPL_ELSE -->
-				<option value=" ">Sans</option>
+				<option value=" ">Aucun</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8a" -->
 				<option value="a" SELECTED>Excellent</option>
diff --git a/koha-tmpl/intranet-tmpl/npl/en/includes/help-bottom.inc b/koha-tmpl/intranet-tmpl/npl/en/includes/help-bottom.inc
new file mode 100644
index 0000000000..dd8946dd21
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/npl/en/includes/help-bottom.inc
@@ -0,0 +1,3 @@
+<div class="action"><form action="help.pl" method="get"><input type="button" class="submit" onclick="window.close(); return false;" value="Close Help Window" /></form></div></div>
+</body>
+</html>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/npl/en/members/pay.tmpl b/koha-tmpl/intranet-tmpl/npl/en/members/pay.tmpl
index 72aacc498c..2ab9fee4bb 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/members/pay.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/members/pay.tmpl
@@ -17,28 +17,33 @@
 	
 <!-- TMPL_LOOP name="loop_pay" -->
 <tr>
-	<td><fieldset><label for="payfine<!-- TMPL_VAR name="i" -->">Unpaid</label><input id="payfine<!-- TMPL_VAR name="i" -->" type="radio" name="payfine<!-- TMPL_VAR name="i" -->" value="no" checked="checked" /><br>
-	<label for="payfine<!-- TMPL_VAR name="i" -->">Pay</label><input type="radio" id="payfine<!-- TMPL_VAR name="i" -->" name="payfine<!-- TMPL_VAR name="i" -->" value="yes" /><br>
-	<label for="payfine<!-- TMPL_VAR name="i" -->">Writeoff</label><input type="radio" id="payfine<!-- TMPL_VAR name="i" -->" name="payfine<!-- TMPL_VAR name="i" -->" value="wo" /></fieldset>
+	<td><select name="payfine<!-- TMPL_VAR name="i" -->">
+	<option value="no">Unpaid</option>
+	<option value="yes">Paid</option>
+	<option value="wo">Writeoff</option>
+	</select>
 	<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="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 class="debit"><!-- TMPL_VAR name="amount" --></td>
+	<td class="debit"><!-- TMPL_VAR name="amountoutstanding" --></td>
 </tr>
 <!-- /TMPL_LOOP -->
+<tfoot>
 <tr>
 	<td colspan="4">Total Due</td>
-	<td><!-- TMPL_VAR name="total" --></td>
+	<td class="debit"><!-- TMPL_VAR name="total" --></td>
 	</tr>
+	</tfoot>
 </table></div>
-<input type="submit" name="submit"  value="Make Payment" class="submit" /></form> <form class="inline" action="moremember.pl" method="get"><input type="hidden" value="<!-- TMPL_VAR name="bornum" -->" name="bornum" /> <input type="submit" class="submit" value="Return to Member Record" /></form>
+<input type="submit" name="submit"  value="Make Payment" class="submit" /></form>
+<div class="tabitem"><form action="/cgi-bin/koha/members/moremember.pl" method="get"><input type="hidden" value="<!-- TMPL_VAR name="bornum" -->" name="bornum" /> <input type="submit" class="submit" value="Return to Patron Record" /></form> <form action="/cgi-bin/koha/boraccount.pl" method="get"><input type="hidden" value="<!-- TMPL_VAR name="bornum" -->" name="bornum" /><input type="submit" value="View Patron Account" class="submit" /></form></div>
 </div>
 
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/npl/en/parameters/marctagstructure.tmpl b/koha-tmpl/intranet-tmpl/npl/en/parameters/marctagstructure.tmpl
index d702ba48c1..a8b325dea2 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/parameters/marctagstructure.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/parameters/marctagstructure.tmpl
@@ -8,128 +8,167 @@
 <!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
 
-<script language="JavaScript" type="text/javascript">
-
+<div id="main">
+<h1>MARC tag structure admin for <!-- TMPL_IF NAME="frameworkcode" --><!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR NAME="frameworkcode" -->)<!-- TMPL_ELSE -->default MARC framework<!-- /TMPL_IF --></h1>
+<script language="javascript" type="text/javascript">
+	function _(s) { return s } // dummy function for gettext
+	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	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=="") {
+	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.tagfield.value.length==0) {
-			_alertString += "- tag number missing\n";
+			_alertString += "\n- " + _("tag number missing");
 		}
 		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 of the following problem(s)");
+			alertString2 += "\n------------------------------------------------------------------------------------\n";
 			alertString2 += _alertString;
 			alert(alertString2);
 		}
 	}
 	</script>
 
-<div id="main">	
-<!-- TMPL_IF name="add_form" -->
-<!-- -->
-	<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>Tag</td><td><!-- TMPL_VAR name="searchfield" --></td></tr>
-<tr><td>Lib for librarians</td><td><input type="text" name="liblibrarian" value="<!-- TMPL_VAR name="liblibrarian" escape="HTML" -->" size="80" maxlength="100" /></td></tr>
-	<tr><td>Lib for opac</td><td><input type="text" name="libopac" value="<!-- TMPL_VAR name="libopac" escape="HTML" -->" size="80" maxlength="100" /></td></tr>
-	<tr><td>Repeatable</td><td><!-- TMPL_VAR name="repeatable" --></td></tr>
-	<tr><td>Mandatory</td><td><!-- TMPL_VAR name="mandatory" --></td></tr>
-	<tr><td>Authorised value</td><td><!-- TMPL_VAR name="authorised_value" --> (if you select a value here, the indicators will be limited to the authorised value list)</td></tr>
-	</table><p><input type="button" value="OK" onclick="Check(this.form)" class="submit" /> <input type="button" class="cancel" value="Cancel" onclick="location.href='<!-- TMPL_VAR name="script_name" -->'; return false;" /></p>
+<!-- TMPL_IF NAME="add_form" -->
+<!-- ------------------------------------------------------------------------ -->
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
+		<input type="hidden" name="op" value="add_validate">
+		<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
+	<div class="data"><table>
+		<caption><!-- TMPL_IF NAME="use-heading-flags-p" --><!-- TMPL_IF NAME="heading-modify-tag-p" -->Modify tag<!-- /TMPL_IF --><!-- TMPL_IF NAME="heading-add-tag-p" -->Add tag<!-- /TMPL_IF --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF --></caption>
+	<tr><th><label>Tag<label></th><td><!-- TMPL_VAR NAME="searchfield" --></td></tr>
+	<tr><th><label for="liblibrarian">Tag Label in Intranet</label></th><td><input type="text" id="liblibrarian" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" escape=HTML -->" size="80" maxlength="100"></td></tr>
+	<tr><th><label for="libopac">Tag Label in OPAC</label></th><td><input type="text" id="libopac" name="libopac" value="<!-- TMPL_VAR NAME="libopac" escape=HTML -->" size="80" maxlength="100"></td></tr>
+	<tr><th><label for="repeatable">Repeatable</label></th><td><!-- TMPL_VAR NAME="repeatable" --></td></tr>
+	<tr><th><label for="mandatory">Mandatory</label></th><td><!-- TMPL_VAR NAME="mandatory" --></td></tr>
+	<tr><th><label for="authorised_value">Authorized value</label></th><td><!-- TMPL_VAR NAME="authorised_value" --> (if you select a value here, the indicators will be limited to the authorised value list)</td></tr>
+	</table></div>
+		<p><input type="submit" value="Save Changes" class="submit" onclick="Check(this.form)" /></p>
+	<p><input type="submit" value="Cancel and Return to MARC Tag Structure" class="cancel" onclick="location.href='<!-- TMPL_VAR NAME="script_name" -->?frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->'; return false;" /></p>
 	</form>
 <!-- /TMPL_IF -->
 
 
-<!-- TMPL_IF name="delete_confirm" -->
-<!-- -->
-<h3>Confirm Deletion of Tag <em><!-- TMPL_VAR name="searchfield" --></em></h3>
-<table>
-	<tr>
-		<td>Tag</td>
-		<td><!-- TMPL_VAR name="searchfield" --></td>
-	</tr>
-	<tr><td>&nbsp;</td><td><!-- TMPL_VAR name="liblibrarian" --></td></tr>
-	</table><div class="form"><form action="<!-- TMPL_VAR name="script_name" -->" method="post"><input type="hidden" name="op" value="delete_confirmed" /><input type="hidden" name="searchfield" value="<!-- TMPL_VAR name="searchfield" -->" /><input type="submit" value="Delete this Tag" class="cancel" /></form> <form action="<!-- TMPL_VAR name="script_name" -->" method="post"><input type="submit" value="Do not Delete" class="submit" /></form></div>
+<!-- TMPL_IF NAME="delete_confirm" -->
+<!-- ------------------------------------------------------------------------ -->
+<div class="data"><table>
+<caption>Confirm Deletion of Tag <em><!-- TMPL_VAR NAME="searchfield" --></em>?</caption>
+	<tr><th>Tag: </th><td><!-- TMPL_VAR NAME="searchfield" --></td></tr>
+	<tr><th>Description: </th><td><!-- TMPL_VAR NAME="liblibrarian" --></td></tr>
+	</table></div>
+	<form class="inline" 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="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">	<input type="submit" class="cancel" value="Yes, Delete this Tag"></form> <form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" class="submit" value="No, Do Not Delete"></form>
 <!-- /TMPL_IF -->
 
-<!-- TMPL_IF name="delete_confirmed" -->
-<!-- -->
-<h3>Data Deleted</h3>
-<div class="form"><form action="<!-- TMPL_VAR name="script_name" -->" method="post">
-	<input type="submit" value="OK" class="submit" />
+<!-- TMPL_IF NAME="delete_confirmed" -->
+<!-- ------------------------------------------------------------------------ -->
+	<div class="details"><h3>Tag Deleted</h3>
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
+	<input type="submit" class="submit" value="Return to MARC Tag Structure">
 	</form></div>
 <!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="framework_create" -->
+<!-- ------------------------------------------------------------------------ -->
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+		<input type="hidden" name="op" value="framework_create_confirm">
+		<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
+		Create framework for <!-- TMPL_VAR NAME="frameworkcode" --> (<!-- TMPL_VAR NAME="frameworktext" -->) using
+		<select name="existingframeworkcode">
+			<option value="">Default</option>
+		<!-- TMPL_LOOP NAME="existingframeworkloop" -->
+			<option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="frameworktext" --></option>
+		<!-- /TMPL_LOOP -->
+		</select>
+		<input type="submit" value="OK" class="button">
+	</form>
+<!-- /TMPL_IF -->
 
-<!-- -->
-<!-- TMPL_IF name="else" -->
-
-<h1>MARC tag structure admin</h1>
+<!-- ------------------------------------------------------------------------ -->
+<!-- TMPL_IF NAME="else" -->
 
-<!-- TMPL_IF NAME="searchfield" --><div id="results"><!-- TMPL_VAR name="searchfield" --></div><!-- /TMPL_IF -->
-<form action="<!-- TMPL_VAR name="script_name" -->" method="post">
-	<input type="text" name="searchfield" value="" />
-	<input type="submit" name="submit" value="Search" class="submit" />
+<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+<label for="frameworkcode">Select a framework: </label>
+	<select id="frameworkcode" name="frameworkcode">
+		<option value="">Default</option>
+	<!-- TMPL_LOOP NAME="frameworkloop" -->
+		<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF NAME="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="frameworktext" --></option>
+	<!-- /TMPL_LOOP -->
+	</select>
+	<label for="searchfield">Search for Tag: </label>
+	<input type="text" name="searchfield" id="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
+	<input type="submit" value="Search" class="submit">
 </form>
-<table><tr>
-	<th>Tag</th>
-	<th>Lib</th>
-	<th>Repeatable</th>
-	<th>Mandatory</th>
-	<th>Authorised value</th>
-	<th>Subfields</th>
-	<th>Edit/Delete</th>
+<p class="note">NOTE : if you change the link between a MARC subfield and a non-MARC field, ask your administrator to run misc/rebuildnonmarc.pl script.</p>
+
+	<table>
+	<tr>
+		<th>Tag</th>
+		<th>Lib</th>
+		<th>Repeatable</th>
+		<th>Mandatory</th>
+		<th>Authorized<br />value</th>
+		<th>Subfields</th>
+		<th>Edit</th>
+		<th>Delete</th>
+	<!-- TMPL_LOOP NAME="loop" -->
+	<!-- TMPL_IF NAME="toggle" --><tr><!-- TMPL_ELSE --><tr class="highlight"><!-- /TMPL_IF -->
+		<td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
+		<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
+		<td><!-- TMPL_IF NAME="repeatable" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
+		<td><!-- TMPL_IF NAME="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
+		<td><!-- TMPL_VAR NAME="authorised_value" --></td>
+		<td><strong><a href="<!-- TMPL_VAR NAME="subfield_link" -->">Edit Subfields</a></strong></td>
+		<td><a href="<!-- TMPL_VAR NAME="edit" -->">Edit</a></td>
+		<td><a href="<!-- TMPL_VAR NAME="delete" -->">Delete</a></td>
 	</tr>
-<!-- TMPL_LOOP name="loop" -->
-<tr>
-	<td><!-- TMPL_VAR name="tagfield" --></td>
-	<td><a href="<!-- TMPL_VAR name="edit" -->"><!-- TMPL_VAR name="liblibrarian" --></a></td>
-	<td><!-- TMPL_IF name="repeatable" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
-	<td><!-- TMPL_IF name="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
-	<td><!-- TMPL_VAR name="authorised_value" --></td>
-	<td><a href="<!-- TMPL_VAR name="subfield_link" -->">subfields</a></td>
-	<td><a class="edit" href="<!-- TMPL_VAR name="edit" -->">Edit</a> <a class="delete" href="<!-- TMPL_VAR name="delete" -->">Delete</a></td>
-</tr>
-<!-- /TMPL_LOOP -->
-</table>
-<div class="tabitem"><!-- TMPL_IF name="previous" --><!-- TMPL_VAR name="previous" -->&lt;&lt;Previous Tags</a><!-- TMPL_ELSE --><!-- /TMPL_IF -->
-<!-- /TMPL_IF --> <form action="<!-- TMPL_VAR name="script_name" -->" method="post">
-	<input type="hidden" name="op" value="add_form" /><input type="submit" value="Add tag" class="submit" /></form> <!-- TMPL_IF name="next" --><!-- TMPL_VAR name="next" -->Next Tags &gt;&gt;</a><!-- /TMPL_IF --></div>
+	<!-- /TMPL_LOOP -->
+	</table>
+<div id="pages">	<!-- TMPL_IF NAME="isprevpage" -->
+			<a class="pages" href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->">&lt;&lt; Previous</a>
+		<!-- /TMPL_IF --><form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+	<input type="hidden" name="op" value="add_form">
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+		<input type="hidden" name="op" value="add_form">
+	<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
+		<input type="submit" class="submit" value="Add Tag" />
+	</form>
+		<!-- TMPL_IF NAME="nextpage" -->
+			<a class="pages" href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->">Next &gt;&gt;</a>
+		<!-- /TMPL_IF --></div>
+</div>
+<!-- /TMPL_IF -->
+
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/unido/en/acqui.simple/addbiblio-nomarc.tmpl b/koha-tmpl/intranet-tmpl/unido/en/acqui.simple/addbiblio-nomarc.tmpl
deleted file mode 100644
index 695d51aabc..0000000000
--- a/koha-tmpl/intranet-tmpl/unido/en/acqui.simple/addbiblio-nomarc.tmpl
+++ /dev/null
@@ -1,88 +0,0 @@
-<TMPL_INCLUDE NAME="acquisitions-top.inc">
-
-<FONT SIZE=6><em>Adding a new Biblio</em></FONT><br>
-
-<table bgcolor="#ffcc00" width="80%" cellpadding="5">
-  <tr>
-  <td><FONT SIZE=5>Copyright Information </font></td>
-  </tr>
-</table>
-
-<TMPL_IF NAME="ERROR">
-<p />
-<center>
-<font color="#FF0000">Please Specify a Title</font>
-</center>
-</TMPL_IF>
-
-<FORM action="savebiblio.pl" method="post">
-<input type=hidden name="stype" value="<TMPL_VAR NAME="PERIODICAL">">
-<table align="center">
-<tr>
-<td>Title: *</td>
-<td><INPUT name="title" size="40" /></td>
-</tr>
-<tr>
-<td>Subtitle:</td>
-<td><INPUT name="subtitle" size="40" /></td>
-</tr>
-
-<tr valign="top">
-<td>Series Title:<br />
-<i>(if applicable)</i></td>
-<td><INPUT name="seriestitle" size="40" /></td>
-</tr>
-
-<tr>
-<td>Conference Title:</td>
-<td><INPUT name="conference" size="40" /></td>
-</tr>
-
-<tr>
-<td>Author:</td>
-<td><INPUT name="author" size="40" /></td>
-</tr>
-
-<tr valign="top">
-<td>Additional Authors:<br><i>One Author per line</i></td>
-<td><textarea name="additionalauthors" cols="30" rows="6"></textarea></td>
-</tr>
-
-
-
-<tr>
-<td>Copyright Date:</td>
-<td><INPUT name="copyrightdate" size="40" /></td>
-</tr>
-
-<tr valign="top">
-<td>Abstract:</td>
-<td><textarea cols="30" rows="6" name="abstract"></textarea></td>
-</tr>
-
-<tr valign="top">
-<td>Subject Headings:<br><i>One Subject per line</i></td>
-<td><textarea name="subjectheadings" cols="30" rows="6"></textarea></td>
-</tr>
-
-<tr valign="top">
-<td>Language:</td>
-<td> <Select name="language">
-<TMPL_LOOP NAME="languages">
-<option value="<TMPL_VAR NAME="language">"><TMPL_VAR NAME="language"></option>
-</TMPL_LOOP>
-</select>
-</td>
-</tr>
-
-<tr valign="top">
-<td>Notes:</td>
-<td><textarea cols="30" rows="6" name="notes"></textarea></td>
-</tr>
-<tr valign="top">
-<td></td><td><input type="submit" value="Save" class="go"></td>
-</tr>
-</table>
-</FORM>
-* Required
-<TMPL_INCLUDE NAME="acquisitions-bottom.inc">
diff --git a/koha-tmpl/intranet-tmpl/unido/en/acqui.simple/addbooks.tmpl b/koha-tmpl/intranet-tmpl/unido/en/acqui.simple/addbooks.tmpl
deleted file mode 100644
index 631ddd8210..0000000000
--- a/koha-tmpl/intranet-tmpl/unido/en/acqui.simple/addbooks.tmpl
+++ /dev/null
@@ -1,79 +0,0 @@
-<html><TMPL_INCLUDE NAME="acquisitions-top.inc">
-
-	
-<div class="crumb"><a href="/cgi-bin/koha/mainpage.pl">Home</a> > Add New Items</div>
-
-
-
-<h1>Add New Items</h1>
-<TMPL_IF name="noitemsfound">
-	<p />
-	<font color="red" size="4">No items found</font>
-</TMPL_IF>
-<TMPL_IF name="websiteadded">
-	<p />
-	<font color="red" size="4">Website Biblioitem Added</font>
-</TMPL_IF>
-
-<p />
-
-
-
-
-<form action="isbnsearch.pl">
-
-<table cellpadding="3" border=0>
-
-<tr><td colspan="3">
-<h2>Add Item</h2>
-
-</TD></TR>
-
-<tr valign="top">
-			<td class="lable">Title</td>
-			<td><input type="text" name="title" class="mid-field" /></td>
-<td><input type="submit" value="Go" class="go"/></td>
-		</tr>
-		<tr valign="top">
-			<td  class="lable">ISBN:</td>
-			<td ><input type="text" name="isbn" class="mid-field"/></td>
-<td><input type="submit" value="Go" class="go"/></td>
-			
-		</tr>
-
-</form>
-
-<tr><td colspan="3"><br><h2>Add Periodical</h2></td>
-	</tr>
-
-<form action="isbnsearch.pl" method="post">
-
-	<tr>
-		<td>Title:</td>
-		<td><input type="text" name="title" class="mid-field" /></td>
-		<td><input type="submit" value="Go" class="go" /></td>
-		<input type=hidden name="stype" value="periodical">
-	</tr>
-	
-</FORM>
-
-
-
-<tr><td colspan="3"><br><h2>Add New Website</H2></td>
-	</tr>
-
-<form action="websitesearch.pl" method="post">
-	
-	<tr>
-		<td>Keyword:</td>
-		<td><input type="text" name="keyword" class="mid-field" /></td>
-		<td><input type="submit" value="Go" class="go" /></td>
-	</tr>
-	</table>
-</FORM>
-<p />
-
-<div class="tip">
-<span class="tip-big">tip</span><span class="tip-text">
-If the ISBN or title is found in the biblio table, it will be retrieved and you can add another copy to it.</span>
-<TMPL_INCLUDE NAME="acquisitions-bottom.inc">
diff --git a/koha-tmpl/intranet-tmpl/unido/en/acqui.simple/additem-nomarc.tmpl b/koha-tmpl/intranet-tmpl/unido/en/acqui.simple/additem-nomarc.tmpl
deleted file mode 100644
index 64adb582f8..0000000000
--- a/koha-tmpl/intranet-tmpl/unido/en/acqui.simple/additem-nomarc.tmpl
+++ /dev/null
@@ -1,197 +0,0 @@
-<TMPL_INCLUDE NAME="acquisitions-top.inc">
-
-<h1><TMPL_VAR NAME="TITLE"></h1>
-
-<TMPL_IF NAME="NOBARCODE">
-<font size="5" color="red">You must give the item a barcode</font>
-<p>
-</TMPL_IF>
-<TMPL_IF NAME="NOBIBLIOITEM">
-<font size="5" color="red">You must create a new group for your item to be
-added to</font>
-<p>
-</TMPL_IF>
-<TMPL_IF NAME="BARCODEINUSE">
-<font size="5" color="red">Sorry, that barcode is already in use</font>
-<p>
-</TMPL_IF>
-
-<h4>BIBLIO RECORD <TMPL_VAR NAME="BIBNUM"></h4>
-<TMPL_IF NAME="AUTHOR">
-<b>Author:</b> <TMPL_VAR NAME="AUTHOR"><br></TMPL_IF>
-
-<TMPL_IF NAME="COPYRIGHT">
-<b>Copyright:</b> <TMPL_VAR NAME="COPYRIGHT"><br>
-</TMPL_IF>
-<TMPL_IF NAME="SERIES">
-<b>Series Title:</b> <TMPL_VAR NAME="SERIES"><br>
-</TMPL_IF>
-<TMPL_IF NAME="NOTES">
-<b>Notes:</b> <TMPL_VAR NAME="NOTES"></TMPL_IF>
-
-<TMPL_LOOP NAME="BIBITEMS">
-<TMPL_IF NAME="WEB">
-
-<H4><TMPL_VAR NAME="biblioitemnumber"> GROUP -
-<TMPL_VAR NAME="itemtype"> <TMPL_VAR NAME="volumeddesc"></H4>
-
-
-URL:</b> <TMPL_VAR NAME="url"><br>
-<b>Date:</b> <TMPL_VAR NAME="publicationyear"><br>
-<b>Notes:</b> <TMPL_VAR NAME="notes">
-
-<TMPL_ELSE>
-<H4><TMPL_VAR NAME="biblioitemnumber"> GROUP -
-<TMPL_VAR NAME="itemtype"> <TMPL_VAR NAME="volumeddesc"></H4>
-
-
-<TMPL_IF NAME="isbn"><b>ISBN:</b> <TMPL_VAR NAME="isbn"><br></TMPL_IF>
-<TMPL_IF NAME="dewey"><b>Dewey:</b> <TMPL_VAR NAME="dewey"><br></TMPL_IF>
-<TMPL_IF NAME="publishercode"><b>Publisher:</b> <TMPL_VAR NAME="publishercode"><br></TMPL_IF>
-<TMPL_IF NAME="place"><b>Place:</b> <TMPL_VAR NAME="place"><br></TMPL_IF>
-<TMPL_IF NAME="publicationyear"><b>Date:</b> <TMPL_VAR NAME="publicationyear"><br></TMPL_IF>
-
-
-<TMPL_LOOP NAME="ITEMS>
-<TMPL_IF NAME="barcode"><b>Item:</b> <TMPL_VAR NAME="barcode"><br></TMPL_IF>
-<TMPL_IF NAME="hombranch"><b>Home Branch:</b> <TMPL_VAR NAME="homebranch"><br></TMPL_IF>
-<TMPL_IF NAME="itemnotes"><b>Notes:</b> <TMPL_VAR NAME="itemnotes"></TMPL_IF>
-
-</TMPL_LOOP>
-</TMPL_IF>
-</TMPL_LOOP>
-
-<form action="saveitem.pl" method="post">
-<input type="hidden" name="biblionumber" value="<TMPL_VAR NAME="BIBNUM">">
-<table border="0" cellspacing="0" cellpadding="5">
-<tr valign="top" >
-<td colspan="2"><h2>ADD NEW
-ITEM</h2>
-<small><i>For a website add the group only</i></small></td>
-</tr>
-<tr valign="top">
-<td>Item Barcode:</td>
-<td><input type="text" name="barcode" size="40"></td>
-</tr>
-
-<tr valign="top">
-<td>Website URL:</td>
-<td><INPUT name="url" size="40"></td>
-</tr>
-
-
-<tr valign="top">
-<td>Branch:</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>Notes:</td>
-<td><textarea name="itemnotes" cols="30" rows="6"></textarea></td>
-</tr>
-<tr valign="top">
-<td colspan="2" ><h2>Add a copy to existing group:</h2></td>
-</tr>
-<tr valign="top">
-<td>Group:</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="Add New Item to Existing Group"></td>
-</tr>
-<tr valign="top">
-<td colspan="2" ><h2>OR add  a new
-Group:</h2></td>
-</tr>
-<tr valign="top">
-<td>Item Type:</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>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>Dewey/UDC:</td>
-<td><INPUT name="dewey" size="40"></td>
-</tr>
-<tr valign="top">
-<td>Dewey Subclass:</td>
-<td><input name="subclass" size="40"></td>
-</tr>
-
-<tr valign="top">
-<td>Publisher:</td>
-<td><input name="publishercode" size="40"></td>
-</tr>
-<tr valign="top">
-<td>Publication Year:</td>
-<td><input name="publicationyear" size="40"></td>
-</tr>
-<tr valign="top">
-<td>Place of Publication:</td>
-<td><input name="place" size="40"></td>
-</tr>
-
-
-
-<!--tr valign="top">
-<td>Volume:</td>
-<td><input name="volume" size="40"></td>
-</tr>
-<tr valign="top">
-<td>Number:</td>
-<td><input name="number" size="40"></td>
-</tr-->
-<tr valign="top">
-<td>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>Size:</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="Add New Item to New Group"></td>
-</tr>
-</table>
-
-</form>
-</center>
-<TMPL_INCLUDE NAME="acquisitions-bottom.inc">
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/unido/en/acqui.simple/addperiodical-nomarc.tmpl b/koha-tmpl/intranet-tmpl/unido/en/acqui.simple/addperiodical-nomarc.tmpl
deleted file mode 100644
index 0092abe88b..0000000000
--- a/koha-tmpl/intranet-tmpl/unido/en/acqui.simple/addperiodical-nomarc.tmpl
+++ /dev/null
@@ -1,174 +0,0 @@
-<html>
-
-
-<TMPL_INCLUDE NAME="acquisitions-top.inc">
-
-<h1>Adding to Periodical:  <TMPL_VAR NAME="TITLE"></h1>
-
-<TMPL_IF NAME="NOBARCODE">
-<font size="5" color="red">You must give the item a barcode</font>
-<p>
-</TMPL_IF>
-<TMPL_IF NAME="NOBIBLIOITEM">
-<font size="5" color="red">You must create a new group for your item to be
-added to</font>
-<p>
-</TMPL_IF>
-<TMPL_IF NAME="BARCODEINUSE">
-<font size="5" color="red">Sorry, that barcode is already in use</font>
-<p>
-</TMPL_IF>
-
-<h4>BIBLIO RECORD <TMPL_VAR NAME="BIBNUM"></h4>
-<TMPL_IF NAME="AUTHOR">
-<b>Author:</b> <TMPL_VAR NAME="AUTHOR"><br></TMPL_IF>
-
-<TMPL_IF NAME="COPYRIGHT">
-<b>Copyright:</b> <TMPL_VAR NAME="COPYRIGHT"><br>
-</TMPL_IF>
-<TMPL_IF NAME="SERIES">
-<b>Series Title:</b> <TMPL_VAR NAME="SERIES"><br>
-</TMPL_IF>
-<TMPL_IF NAME="NOTES">
-<b>Notes:</b> <TMPL_VAR NAME="NOTES"></TMPL_IF>
-
-
-
-
-<form action="saveitem.pl" method="post">
-<input type="hidden" name="biblionumber" value="<TMPL_VAR NAME="BIBNUM">">
-<table border="0" cellspacing="0" cellpadding="5">
-<tr valign="top" >
-<td colspan="2"><h2>Item Details</h2>
-</td>
-</tr>
-<tr valign="top">
-<td>Item Barcode:</td>
-<td><input type="text" name="barcode" size="40" class="important"></td>
-</tr>
-<tr valign="top">
-<td>Branch:</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>Notes:</td>
-<td><textarea name="itemnotes" cols="30" rows="1"></textarea></td>
-</tr>
-
-<tr valign="top">
-<td>Holdings:</td>
-<td><textarea name="holdings" cols="30" rows="6"><TMPL_VAR
-NAME="HOLDINGS"></textarea></td>
-</tr>
-
-<tr valign="top">
-<td colspan="2" ><h2>New Issue/Volume Details</h2></td>
-</tr>
-<tr valign="top">
-<td>Item Type:</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>Volume:</td>
-<td><input name="volume" size="40" value="<TMPL_VAR NAME="volume">"></td>
-</tr>
-<tr valign="top">
-<td>Number:</td>
-<td><input name="number" size="40" value="<TMPL_VAR NAME="number">"></td>
-</tr-->
-<tr valign="top">
-<td>Volume:</td>
-<td><input name="volumeddesc" size="40" value="<TMPL_VAR NAME="volumeddesc">" class="important"></td>
-</tr>
-
-<tr valign="top">
-<td>Publication Year:</td>
-<td><input name="publicationyear" size="40" value="<TMPL_VAR
-NAME="publicationyear">" class="important"></td>
-</tr>
-
-<tr valign="top">
-<td>Website:</td>
-<td><input name="url" size="40" value="<TMPL_VAR
-NAME="url">" ></td>
-</tr>
-
-<tr valign="top">
-<td>ISSN:</td>
-<td><input name="issn" size="40" value="<TMPL_VAR NAME="issn">"></td>
-</tr>
-<tr valign="top">
-<td>LCCN:</td>
-<td><input name="lccn" size="40" value="<TMPL_VAR NAME="lccn">"></td>
-</tr>
-<tr valign="top">
-<td>Dewey/UDC:</td>
-<td><INPUT name="dewey" size="40" value="<TMPL_VAR NAME="dewey">"></td>
-</tr>
-<tr valign="top">
-<td>Dewey Subclass:</td>
-<td><input name="subclass" size="40" value="<TMPL_VAR NAME="subclass">"></td>
-</tr>
-
-<tr valign="top">
-<td>Publisher:</td>
-<td><input name="publishercode" size="40" value="<TMPL_VAR
-NAME="publishercode">"></td>
-</tr>
-
-<tr valign="top">
-<td>Place of Publication:</td>
-<td><input name="place" size="40" value="<TMPL_VAR NAME="place">"></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="Save"></td>
-</tr>
-
-
-<tr valign="top">
-<td colspan="2" ><h2>Add a copy to existing group</h2></td>
-</tr>
-<tr valign="top">
-<td>Group:</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"> - <TMPL_VAR NAME="volumeddesc"></option>
-
-</TMPL_IF>
-
-</TMPL_LOOP>
-</select></td>
-</tr>
-<tr valign="top">
-<td colspan="2" align="center"><input type="submit" name="existinggroup"
-value="Save"></td>
-</tr>
-
-</table>
-
-
-
-</form>
-</center>
-<TMPL_INCLUDE NAME="acquisitions-bottom.inc">
diff --git a/koha-tmpl/intranet-tmpl/unido/en/acqui.simple/isbnsearch.tmpl b/koha-tmpl/intranet-tmpl/unido/en/acqui.simple/isbnsearch.tmpl
deleted file mode 100644
index 81760a5af0..0000000000
--- a/koha-tmpl/intranet-tmpl/unido/en/acqui.simple/isbnsearch.tmpl
+++ /dev/null
@@ -1,104 +0,0 @@
-  <TMPL_INCLUDE NAME="acquisitions-top.inc">
-<font size="6"><em>Biblio Search Results</em></font><br />
-<CENTER>
-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
-</TMPL_IF>
-<p />
-<!-- 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>
-
-<table width="80%" cellpadding="3">
-	<tr valign="center">
-	<td><font size="4">Biblios in koha</font></td>
-	</tr>
-</table>
-<table border="0" cellspacing="0" cellpadding="5" width="80%">
-	<tr valign=top bgcolor=#ffcc00>
-		<td><b>Title</b></td>
-		<td><b>Author</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">&stype=<TMPL_VAR NAME="PERIODICAL">">Add Items</a></td>
-			<TMPL_ELSE>
-			  <td><a href="addbiblio.pl?oldbiblionumber=<TMPL_VAR name="biblionumber">">Edit...</a></td>
-			</TMPL_IF>
-		</tr>
-	</TMPL_LOOP>
-	<TMPL_ELSE>
-	<tr><td colspan=4>Nothing found</td></tr>
-	</TMPL_IF>
-</table>
-<br />
-<table width="80%" cellpadding="3">
-	<tr valign="center">
-	<td><font size="4">Biblios in breeding farm</font></td>
-	</tr>
-</table>
-<table border="0" cellspacing="0" cellpadding="5" width="80%">
-	<tr valign=top bgcolor=#ffcc00>
-		<td><b>Title</b></td>
-		<td><b>Author</b></td>
-		<td><b>ISBN</b></td>
-		<td><b>coming from</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>
-			<TMPL_IF NAME="NOTMARC">
-			
-			<TMPL_ELSE>
-			<td><a href="addbiblio.pl?breedingid=<TMPL_VAR name="id">">Add biblio</a></td>
-			</TMPL_IF>
-		</tr>
-	</TMPL_LOOP>
-	<TMPL_ELSE>
-	<tr><td colspan=6>Nothing found</td></tr>
-	</TMPL_IF>
-	<tr>
-		<td>&nbsp;</td>
-		<td>&nbsp;</td>
-		<td>&nbsp;</td>
-		<td>&nbsp;</td>
-		<TMPL_IF NAME="NOTMARC">
-		<td><a href="addbiblio-nomarc.pl?isbn=<TMPL_VAR name="isbn">">Add New Biblio</a></td>
-		<TMPL_ELSE>
-		<td><a href="addbiblio.pl?isbn=<TMPL_VAR name="isbn">">Add New Biblio</a></td>
-		</TMPL_IF>
-	</tr>
-</table>
-
-<br />
-<TMPL_INCLUDE NAME="acquisitions-bottom.inc">
diff --git a/koha-tmpl/intranet-tmpl/unido/en/catalogue/MARCdetail.tmpl b/koha-tmpl/intranet-tmpl/unido/en/catalogue/MARCdetail.tmpl
deleted file mode 100644
index 0cd11c051d..0000000000
--- a/koha-tmpl/intranet-tmpl/unido/en/catalogue/MARCdetail.tmpl
+++ /dev/null
@@ -1,258 +0,0 @@
-<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">
-			<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="detail.pl?bib=<TMPL_VAR name="biblionumber">">Normal</a></td>
-					<td align="center"><b>MARC biblio : <TMPL_VAR name="bibid"></b></td>
-				</tr>
-			</table>
-			</td>
-		</tr>
-		<tr>
-			<td colspan=3>
-			<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"><a href="javascript:active(10)"><div  id="link10">Item</div></a></td>
-			</tr>
-			</table>
-			</td>
-		</tr>
-		</table>
-	</td>
-	<td>
-		<TMPL_IF NAME="norequests">
-		<TMPL_ELSE>
-			<a href=request.pl?bib=<TMPL_VAR NAME="biblionumber"> class="button">Request</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">
-	<tr>
-         <td width="3%">&nbsp;</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>
-     </table>
-     </DIV>
-
-    <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">
-	<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>
-       </tr>
-	</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">
-	<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>
-       </tr>
-	</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">
-	<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>
-       </tr>
-	</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">
-	<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>
-       </tr>
-	</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">
-	<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>
-       </tr>
-	</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">
-	<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>
-       </tr>
-	</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">
-	<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>
-       </tr>
-	</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">
-	<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>
-       </tr>
-	</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">
-	<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>
-       </tr>
-	</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>
-		<TMPL_LOOP name="item_loop">
-			<tr>
-					<TMPL_VAR name="item_value">
-			</tr>
-		</TMPL_LOOP>
-     </table>
-     </DIV>
-
-<script LANGUAGE="JavaScript">
-function active(numlayer)
-{
-for (i=0; i <= 10 ; i++ ) {
-    ong = i+"XX";
-	link = "link"+i;
-    if (numlayer==i) {
-	document.getElementById(ong).style.visibility="visible";
-	document.getElementById(link).style.backgroundColor="#11AA11";
-	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";
-	document.getElementById(link).style.backgroundImage="";
-}
-}
-}
-</script>
-<TMPL_INCLUDE NAME="cat-bottom.inc">
-
-
diff --git a/koha-tmpl/intranet-tmpl/unido/en/catalogue/catalogue-home.tmpl b/koha-tmpl/intranet-tmpl/unido/en/catalogue/catalogue-home.tmpl
deleted file mode 100644
index bae13f55ae..0000000000
--- a/koha-tmpl/intranet-tmpl/unido/en/catalogue/catalogue-home.tmpl
+++ /dev/null
@@ -1,148 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
-
-<HTML>
-
-<TMPL_INCLUDE NAME="general-top.inc">
-
-<TMPL_INCLUDE NAME="cat-top.inc">
-
-<TMPL_INCLUDE NAME="login.inc">
-
-<TMPL_INCLUDE NAME="general-first-column-divider.inc">
-
-
-<div class="crumb"><a href="/cgi-bin/koha/mainpage.pl">Home</a> > Catalogue Search</div>
-
-<H1>Catalogue Search</H1>
-<FORM ACTION="/cgi-bin/koha/search.pl" METHOD="POST">
-
-<!--Search Form Starts-->
-
-<TABLE class="content">
-	<TR>
-		<TD colspan="2"><h2>General Search</h2></td>
-	</tr>
-			
-	<tr>
-			
-		<TD class="label">Keywords</TD>
-		<TD class="field"><INPUT TYPE=TEXT NAME="keyword" class="field"></TD>
-	</TR>
-				
-	<TR>
-		<TD class="label">Title</TD>
-		<TD class="field"><INPUT TYPE=TEXT NAME="title" class="field">
-		 <INPUT TYPE="checkbox" NAME="ttype" VALUE="exact">Exact</TD>
-	</TR>
-			
-	<TR>
-		<TD class="label">Author</TD>
-		<TD class="field"><INPUT TYPE=TEXT NAME="author" class="field"></TD>
-	</TR>
-			
-	<TR>
-		<TD class="label">Type of Item</TD>
-		<TD class="field" class="field">
-		<SELECT NAME="class">
-		<option value="">All</option>
-		<TMPL_LOOP NAME="itemtypes">
-		<option value="<TMPL_VAR NAME="itemtype">"><TMPL_VAR NAME="description"></option>
-		</TMPL_LOOP>
-
-		</SELECT></td>
-	</tr>
-					
-	<TR>
-		<TD class="label">Langage</TD>
-		<TD class="field">
-		<SELECT NAME="language">
-		<OPTION VALUE="" SELECTED>Any</OPTION>
-		<TMPL_LOOP NAME="languages">
-		<option value="<TMPL_VAR NAME="language">"><TMPL_VAR NAME="language"></option>
-		</TMPL_LOOP>
-		</SELECT></td>
-	</tr>
-					
-					
-	<tr>
-		<TD  class="label">Published After (Year)</TD> 
-		<TD><INPUT TYPE="text" NAME="date-after" class="field"></TD>
-	</TR>
-	
-	<tr>
-		<TD  class="label">Published Before (Year)</TD> 
-		<TD class="field"><INPUT TYPE="text"  NAME="date-before" 		class="field"></TD>
-	</TR>
-
-	<TR>
-		<TD class="label">Dewey/UDC number</TD>
-		<TD class="field"><INPUT TYPE=TEXT NAME="dewey" class="field"></TD>
-	</TR>
-			
-	<tr>
-		<td class="label">Branch</td>
-		<TD class="field">
-		<select name=branch>
-		<option value="">All</option>
-		<TMPL_LOOP NAME="branches">
-		
-		<option value="<TMPL_VAR NAME="branchcode">"><TMPL_VAR NAME="branchname"></option>
-		</TMPL_LOOP>
-
-		</select>
-		</td>
-	</tr>
-	
-	<tr>
-		<td></td>
-		<td class="field" align="right"><input type="submit" class="go" 		value="GO"></td>
-	</tr>
-	
-	<TR>
-		<TD class="heading" colspan="2"><h2>Subject Search</h2></td>
-	</tr>
-									
-	<TR>
-		<TD  class="label">Subject</TD>
-		<TD class="field"><INPUT TYPE=TEXT NAME="subject" 
-		class="mid-field"> 
-		<input type="submit" class="go" value="GO">
-		<INPUT TYPE=HIDDEN NAME="type" VALUE="intra"> 
-		</TD>
-	</TR>
-			
-	<TR>
-		<TD class="heading" colspan="2"><h2>Barcode Search</h2></td>
-	</tr>
-									
-	<TR>
-		<TD class="label">Barcode</TD>
-			
-		<TD class="field-medium"><INPUT TYPE=TEXT NAME="itemnumber" class="mid-field"> 			<input type="submit" class="go" value="GO">
-		</TD>
-	</tr>
-			
-				
-	<TR>
-		<TD class="heading" colspan="2"><h2>ISBN or ISSN Search</h2></td></tr>
-			
-	<TR>
-		<TD class="label">ISBN or ISSN</TD> 
-		<TD class="field-medium"><INPUT TYPE="text"   NAME="isbn" class="mid-field"> 		<input type="submit" class="go" value="GO"></TD>
-	</TR>
-	
-	</TABLE>
-
-</FORM>
-
-	
-	<div class="tip">
-	<Span class="tip-big">tip</span>
-	<span class="tip-text"> you can use more than one field for your search, 
-	eg Title + Author, but this may slow it down.  
-	There is an implicit "and" between search terms.</span></div>
-		
-		
-
-		
-	<TMPL_INCLUDE NAME="general-end.inc">
diff --git a/koha-tmpl/intranet-tmpl/unido/en/catalogue/detail.tmpl b/koha-tmpl/intranet-tmpl/unido/en/catalogue/detail.tmpl
deleted file mode 100644
index 54390dcc86..0000000000
--- a/koha-tmpl/intranet-tmpl/unido/en/catalogue/detail.tmpl
+++ /dev/null
@@ -1,238 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
-
-<HTML>
-
-	<TMPL_INCLUDE NAME="general-top.inc">
-
-	<TMPL_INCLUDE NAME="cat-top.inc">
-
-	<TMPL_INCLUDE NAME="general-first-column-divider.inc">
-
-	
-<div class="crumb"><a href="/cgi-bin/koha/mainpage.pl">Home</a> > <a href="/cgi-bin/koha/catalogue-home.pl">Catalogue Search</a> > Details</div>
-
-
-
-<TMPL_LOOP NAME="BIBLIO_RESULTS">
-	<TMPL_IF NAME="norequests">
-	<TMPL_ELSE>
-		<table align="right"><tr valign="top"><td>
-				<a href="request.pl?bib=<TMPL_VAR NAME="biblionumber">" >Requests</a>
-		</td></tr></table>
-	</TMPL_IF>
-	<h1><TMPL_VAR NAME="title">
-	<TMPL_IF NAME="author"> (<TMPL_VAR NAME="author">)</TMPL_IF></h1>
-	 
-	 
-	<TMPL_VAR NAME="class">
-	<table class="content">
-	<!-----------------BIBLIO RECORD TABLE--------->
-	<tr valign="top">
-		<td colspan="2" class="heading-row">
-<!--			<h2 class="underline">Biblio Record <TMPL_VAR NAME="biblionumber"> </h2>-->
-		</td>
-	</tr>
-	<tr valign="top">
-		<td colspan="2" class="edit-delete">
-			<form action="/cgi-bin/koha/modbib.pl" method="post">
-				
-			
-		
-			<input type="hidden" name="bibnum" value="<TMPL_VAR NAME="biblionumber">">
-						<input type="submit" name="submit" value="Edit" class="go">
-					
-					<input type="submit" name="delete" value="Delete" class="delete">
-					
-			</form></td>
-			
-			</tr>
-			<TMPL_IF NAME="abstract">		
-	<tr valign="top">
-			<td class="result" colspan=2>		
-			<TMPL_VAR NAME="abstract"></td></tr>
-			
-	</TMPL_IF>	
-		<TMPL_IF NAME="url">		
-	<tr valign="top">
-			<td class="label">		
-			Website</td><td class="result"><a href="http://<TMPL_VAR name="url">">http://<TMPL_VAR name="url"></td></tr>
-
-			
-	</TMPL_IF>	
-	
-	<TMPL_IF NAME="subtitle">		
-	<tr valign="top">
-			<td class="label">		
-			Subtitle</td><td class="result"> <TMPL_VAR NAME="subtitle"></td></tr>
-			
-	</TMPL_IF>	
-			<TMPL_IF NAME="seriestitle">
-		<tr valign="top">	
-			<td class="label">
-			Series Title</td><td class="result"> <TMPL_VAR NAME="seriestitle"></td></tr>
-		
-	</TMPL_IF>
-	
-	<TMPL_IF NAME="conference">
-		<tr valign="top">	
-			<td class="label">
-			Conference Title</td><td class="result"> <TMPL_VAR NAME="conference"></td></tr>
-	</TMPL_IF>	
-	<TMPL_IF NAME="unititle">		
-			<tr valign="top">
-			<td class="label">
-			Unititle</td><td class="result"><TMPL_VAR NAME="unititle"></td></tr>
-	
-		
-	</TMPL_IF>
-	<TMPL_IF NAME="author">	
-		<tr valign="top">	
-			<td class="label">Author</td><td class="result"> <a href=/cgi-bin/koha/search.pl?author=<TMPL_VAR
-			NAME="author" ESCAPE=URL>><TMPL_VAR NAME="author"></a></td></tr>
-	</TMPL_IF>	
-	<TMPL_IF NAME="additional">		
-			<tr valign="top">
-			<td class="label">
-			Additional Author</td><td class="result"> <TMPL_VAR NAME="additional"></td></tr>
-	</TMPL_IF>	
-	<TMPL_IF NAME="copyrightdate">		
-			<tr valign="top">
-			<td class="label">
-			Copyright</td><td class="result"> <TMPL_VAR NAME="copyrightdate"></td></tr>
-	</TMPL_IF>	
-	
-	<TMPL_IF NAME="language">		
-			<tr valign="top">
-			<td class="label">
-			Language</td><td class="result"> <TMPL_VAR NAME="language"></td></tr>
-	</TMPL_IF>	
-	
-	<TMPL_IF NAME="subject">	
-			<tr valign="top">
-			<td class="label">
-			Subjects</td><td class="result"><TMPL_VAR NAME="subject"></td></tr>
-			
-	</TMPL_IF>	
-	<TMPL_IF NAME="notes">		
-			
-			<tr valign="top">
-			<td class="label">
-			Notes</td><td class="result"> <TMPL_VAR NAME="notes"></td></tr>
-	</TMPL_IF>	
-	
-	<TMPL_IF NAME=serial">		
-			<tr valign="top">
-			<td class="label">
-			Serial</td><td class="result"> <TMPL_VAR NAME="serial"></td></tr>
-			
-	</TMPL_IF>	
-	
-
-</TMPL_LOOP>	
-<TMPL_LOOP NAME="SITE_RESULTS">
-<tr valign="top">
-<td class="label">Additional Web Links</td>
-<td class="result"><a href="http://<TMPL_VAR name="url">"><TMPL_VAR name="title"></a><br>
-
-<TMPL_VAR name="description"><br>
-<a href="http://<TMPL_VAR name="url">">http://<TMPL_VAR name="url"></a><p>
-</td>
-</tr>
-</TMPL_LOOP>
-	
-			<tr valign="top">
-			<td class="label">Viewing Options</td>
-			<td>
-			<a href="MARCdetail.pl?bib=<TMPL_VAR name="biblionumber">">Show MARC </a>
-		
-		</td>
-	</tr>
-	
-	
-	</table>
-	
-<p>&nbsp;</p>
-
-<h2>Holdings Information (<TMPL_VAR NAME="count"> items)</h2>
-
-
-<table class="data" cellspacing=0 cellpadding=0>
-	
-	<tr class="data-header" valign="top">
-	<td class="column-first">&nbsp;Item Type</td>
-		<td class="column-middle">&nbsp;Class</td>
-		<td class="column-middle">&nbsp;Location</td>
-		<td class="column-middle">&nbsp;Date Due</td>
-		<td class="column-middle">&nbsp;Last Seen</td>
-		<td class="column-middle">&nbsp;Barcode</td>
-		<td class="column-middle">&nbsp;Volume</td>		
-		<td class="column-last">&nbsp;Action</td>		
-		
-		
-	</tr>
-	<TMPL_LOOP NAME="ITEM_RESULTS">
-		<tr valign="top">
-			
-			<td class="column-first">&nbsp;<TMPL_VAR NAME="itemtype"> &nbsp;</td>
-			<td class="column-middle">&nbsp;<a href=/cgi-bin/koha/search.pl?dewey=<TMPL_VAR NAME="dewey" ESCAPE=URL>><TMPL_VAR NAME="class"></a> &nbsp;</td>
-			<td class="column-middle">&nbsp;<TMPL_VAR NAME="branchname"> &nbsp;</td>
-			<td class="column-middle">&nbsp;<b><TMPL_VAR NAME="datedue"></b> &nbsp;</td>
-			<td class="column-middle">&nbsp;<TMPL_VAR NAME="datelastseen"> &nbsp;</td>
-			<td class="column-middle">&nbsp;<TMPL_VAR NAME="barcode"> &nbsp;</td>
-			<td class="column-middle">&nbsp;<TMPL_VAR NAME="volumeddesc"> &nbsp;</td>
-			
-		    <td class="column-last">&nbsp;<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">">More</a>
-			
-<TMPL_IF NAME="type">
-			&nbsp;	|  &nbsp;<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_ELSE></td>
-
-			
-		
-			
-			</TMPL_IF>
-		</tr>
-	</TMPL_LOOP>
-	<TMPL_LOOP NAME="WEB_RESULTS">
- 		<tr >
-		<td  class="column-first">&nbsp;<TMPL_VAR NAME="itemtype"></td>
-			<td class="column-middle">&nbsp;Website</td>
-			<td class="column-middle">&nbsp;Online</td>
-			<td class="column-middle">&nbsp;<a href="http://<TMPL_VAR NAME="url">">Available</a></td>
-			<td class="column-middle">&nbsp;</td>
-		
-			<td class="column-middle">&nbsp;
-				<a href="http://<TMPL_VAR NAME="url">"><TMPL_VAR NAME="url"></a>
-			
-			</td>
-				<td class="column-middle">&nbsp;</td>
-				<td class="column-last">&nbsp;<a href="/cgi-bin/koha/moredetail.pl?item=<TMPL_VAR NAME="itemnumber>&bib=<TMPL_VAR NAME="biblionumber">&bi=<TMPL_VAR NAME="biblioitemnumber">">More</a></td>
-	
-				</tr>
-	</TMPL_LOOP>
-</table>
-
-<p> &nbsp</p>
-
-	<div class="tip">
-	<Span class="tip-big">tip</span>
-	<span class="tip-text"> to <b>view or edit the rest of the record</b> for an item, 
-	click on <b>More </b>. You will see the group and item information together.
-	
-			<b>Editing the biblio</b>  will update
-			the record for <b>all</b> the items. 
-			
-			
-			<b>Make a new biblio or add items in  </b> 
-			<a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">acquisitions</a>.
-			To move items to a new biblio you will need to re-aquire them and delete them
-			from this biblio.</span></div>
-
-
-	<TMPL_INCLUDE NAME="general-end.inc">
-	
-
-</BODY>
-
diff --git a/koha-tmpl/intranet-tmpl/unido/en/catalogue/moredetail.tmpl b/koha-tmpl/intranet-tmpl/unido/en/catalogue/moredetail.tmpl
deleted file mode 100644
index 31993f79ec..0000000000
--- a/koha-tmpl/intranet-tmpl/unido/en/catalogue/moredetail.tmpl
+++ /dev/null
@@ -1,136 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
-
-<HTML>
-
-
-	<TMPL_INCLUDE NAME="general-top.inc">
-
-	<TMPL_INCLUDE NAME="cat-top.inc">
-
-	<TMPL_INCLUDE NAME="general-first-column-divider.inc">
-
-	
-<div class="chumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> > <a href="/cgi-bin/koha/catalogue-home.pl">Catalogue Search</a> > <a
-href=/cgi-bin/koha/detail.pl?bib=<TMPL_VAR NAME="biblionumber">&type=intra>Biblio Details</a> > Group and Item Details</div>
-
-
-
-
-<TMPL_LOOP NAME="BIBITEM_DATA">
-	<table align="right"><tr><td>
-<a href=/cgi-bin/koha/request.pl?bib=<TMPL_VAR NAME="biblionumber">>Requests</a></td></tr></table>
-
-
-<h1>Group and Item Details For<br>
-<a
-href=/cgi-bin/koha/detail.pl?bib=<TMPL_VAR NAME="biblionumber">&type=intra><TMPL_VAR NAME="title">
-<TMPL_IF NAME="author">(<TMPL_VAR NAME="author">)</TMPL_IF></a></h1>
-
-<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
-is set up to only display those fields that a record has data for
------------->
-
-
-<TABLE  class="more-details-group" align="left">
-<TR class="more-details">
-<td  class="more-details-header">
-<H3> Group <TMPL_VAR NAME="biblioitemnumber"> - <TMPL_VAR NAME="description"></h3> </TD>
-</TR>
-<tr>
-<TD class="more-details-data">
-<INPUT TYPE="submit" name="submit"  VALUE="Edit" class="go">
-<INPUT TYPE="submit" name="delete"  VALUE="Delete" class="delete">
-<br>
-<b>Biblionumber:</b> <TMPL_VAR NAME="biblionumber"><br>
-<b>Item Type:</b> <TMPL_VAR NAME="itemtype"><br>
-<b>Classification:</b> <TMPL_VAR NAME="classification"><TMPL_VAR NAME="dewey"><TMPL_VAR NAME="subclass"><br>
-
-<TMPL_IF NAME="url"><b>URL:</b> <TMPL_VAR NAME="url"><br>	</TMPL_IF>
-<TMPL_IF NAME="isbn"><b>ISBN:</b> <TMPL_VAR NAME="isbn"><br>	</TMPL_IF>
-<TMPL_IF NAME="issn"><b>ISSN:</b> <TMPL_VAR NAME="issn"><br>	</TMPL_IF>
-<TMPL_IF NAME="lccn"><b>LCCN:</b> <TMPL_VAR NAME="lccn"><br>	</TMPL_IF>
-
-<TMPL_IF NAME="publishercode"><b>Publisher:</b> <TMPL_VAR NAME="publishercode"> <br>	</TMPL_IF>
-<TMPL_IF NAME="place"><b>Place:</b> <TMPL_VAR NAME="place"><br>	</TMPL_IF>
-<TMPL_IF NAME="publicationyear"><b>Date:</b> <TMPL_VAR NAME="publicationyear"><br>	</TMPL_IF>
-<TMPL_IF NAME="volume"><b>Volume:</b> <TMPL_VAR NAME="volume"><br>	</TMPL_IF>
-<TMPL_IF NAME="number"><b>Volume Number:</b> <TMPL_VAR NAME="number"><br>	</TMPL_IF>
-<TMPL_IF NAME="volumeddesc"><b>Volume Description:</b> <TMPL_VAR NAME="volumeddesc"><br></TMPL_IF>
-<TMPL_IF NAME="pages"><b>Pages:</b> <TMPL_VAR NAME="pages"><br>	</TMPL_IF>
-<TMPL_IF NAME="size"><b>Size:</b> <TMPL_VAR NAME="size"><br>	</TMPL_IF>
-<TMPL_IF NAME="loanlength"><b>Loan Length:</b> <TMPL_VAR NAME="loanlength"><br>	</TMPL_IF>
-<TMPL_IF NAME="rentalcharge"><b>Rental Charge:</b> <TMPL_VAR NAME="rentalcharge"><br>	</TMPL_IF>
-<TMPL_IF NAME="bnotes"><b>Notes:</b> <TMPL_VAR NAME="bnotes"><br>	</TMPL_IF>
-<b>No. of Items:</b> <TMPL_VAR NAME="count">
-</TD>
-</tr>
-</table>
-</form>
-</TMPL_LOOP>
-<TMPL_LOOP NAME="ITEM_DATA">
-
-
-<!--HOlder image between the tables when they display side by side-->
-
-<img src="<TMPL_VAR name="themelang">/images/holder.gif" width=16 height=300 align=left>
-
-
-<!-- Item table, showeing details of the item since it came into the library-->
-
-
-<TABLE class="more-details-item" align="left">
-<TR VALIGN=TOP>
-<td  class="more-details-header"><h3>Item Barcode
-<TMPL_VAR NAME="barcode"></h3></TD>
-</TR>
-<tr class="more-details">
-<TD class="more-details-data">
-<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="submit" name="submit"  VALUE="Edit" class="go">
-<INPUT TYPE="submit" name="delete"  VALUE="Delete" class="delete">
-<br>
-<TMPL_IF NAME="homebranch"><b>Home Branch:</b> <TMPL_VAR NAME="homebranch"><br></TMPL_IF>
-<TMPL_IF NAME="datelastseen"><b>Last seen:</b> <TMPL_VAR NAME="datelastseen"><br></TMPL_IF>
-<TMPL_IF NAME="timestamp0"><b>Last borrowed:</b> <TMPL_VAR NAME="timestamp0"><br></TMPL_IF>
-<!-- on issue bit -->
-<TMPL_IF NAME="card0"><b>Last Borrower 1:</b> <a href="/cgi-bin/koha/moremember.pl?bornum=<TMPL_VAR NAME="card0">"><TMPL_VAR NAME="card0"></a><br></TMPL_IF>
-<TMPL_IF NAME="card1"><b>Last Borrower 2:</b> <a href="/cgi-bin/koha/moremember.pl?bornum=<TMPL_VAR NAME="card1">"><TMPL_VAR NAME="card1"></a><br></TMPL_IF>
-<TMPL_IF NAME="holdingbranch"><b>Current Branch:</b> <TMPL_VAR NAME="holdingbranch"><br></TMPL_IF>
-<TMPL_IF NAME="replacementprice"><b>Replacement Price:</b> <TMPL_VAR NAME="replacementprice"><br></TMPL_IF>
-<TMPL_IF NAME="itemlost"><b>Item lost:</b> <TMPL_VAR NAME="itemlost"><br></TMPL_IF>
-<TMPL_IF NAME="paidfor"><b>Paid for:</b> <TMPL_VAR NAME="paidfor"><br></TMPL_IF>
-<TMPL_IF NAME="itemnotes"><b>Notes:</b> <TMPL_VAR NAME="itemnotes"><br></TMPL_IF>
-<TMPL_IF NAME="renewals"><b>Renewals:</b> <TMPL_VAR NAME="renewals"><br></TMPL_IF>
-<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>Accession Date:</b> <TMPL_VAR NAME="dateaccessioned"></a><br>
-<TMPL_IF NAME="withdrawn"><b>Cancelled: <TMPL_VAR NAME="wthdrawn"><br></TMPL_IF>
-<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>
-
-
-
-</TD>
-</tr>
-</table>
-</form>
-</TMPL_LOOP>
-
-<p>
-</form>
-
-<TMPL_INCLUDE NAME="cat-bottom.inc">
-	
-
-</BODY>
-
diff --git a/koha-tmpl/intranet-tmpl/unido/en/catalogue/searchresults.tmpl b/koha-tmpl/intranet-tmpl/unido/en/catalogue/searchresults.tmpl
deleted file mode 100644
index 623f644384..0000000000
--- a/koha-tmpl/intranet-tmpl/unido/en/catalogue/searchresults.tmpl
+++ /dev/null
@@ -1,113 +0,0 @@
-<html>
-	<TMPL_INCLUDE NAME="general-top.inc">
-
-	<TMPL_INCLUDE NAME="cat-top.inc">
-
-	<TMPL_INCLUDE NAME="general-first-column-divider.inc">
-	
-<div class="crumb"><a href="/cgi-bin/koha/mainpage.pl">Home</a> > <a href="/cgi-bin/koha/catalogue-home.pl">Catalogue Search</a> > Search Results</div>
-
-
-<h1>Search Results</h1>
-
-<TMPL_IF NAME=searchdesc>
-	You searched on <b><TMPL_VAR NAME=searchdesc></b>, 
-<TMPL_ELSE>
-	You did not specify any seach criteria, please <a href="/cgi-bin/koha/catalogue-home.pl"> try again</a><br>
-</TMPL_IF>
-
-<b><TMPL_VAR NAME=numrecords></b>Results found
-<p>
-
-
-<!-- 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=<TMPL_VAR name="themelang">/images/background-opac.gif<TMPL_ELSE> background="<TMPL_VAR name="themelang">/images/background-mem.gif"</TMPL_IF>>
-	<th align=left>Title</th><th align=left>Author</th><th>&copy;</th><th>Item Count</th><th>Location</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=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">>Request</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>
-Results <TMPL_VAR NAME="startfrom"> through <TMPL_VAR NAME="endat"> of <TMPL_VAR NAME="numrecords"> records.
-
-
-</TMPL_IF>
-
-
-
-<TMPL_INCLUDE NAME="cat-bottom.inc">
-<TMPL_INCLUDE NAME="general-end.inc">
-	
-
-</BODY>
diff --git a/koha-tmpl/intranet-tmpl/unido/en/catalogue/subject.tmpl b/koha-tmpl/intranet-tmpl/unido/en/catalogue/subject.tmpl
deleted file mode 100644
index 44f402122a..0000000000
--- a/koha-tmpl/intranet-tmpl/unido/en/catalogue/subject.tmpl
+++ /dev/null
@@ -1,35 +0,0 @@
-<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>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>
-</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>
-</table>
-<br>
-Results <TMPL_VAR NAME="startfrom"> through <TMPL_VAR NAME="endat"> of <TMPL_VAR NAME="numrecords"> records.
-<hr>
-
-<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/unido/en/circ/returns.tmpl b/koha-tmpl/intranet-tmpl/unido/en/circ/returns.tmpl
deleted file mode 100644
index c405ba4a94..0000000000
--- a/koha-tmpl/intranet-tmpl/unido/en/circ/returns.tmpl
+++ /dev/null
@@ -1,252 +0,0 @@
-<TMPL_INCLUDE Name="circulation-top.inc">
-
-<script language="JavaScript">
-<!-- Hide from old browsers
-function openwindow(targeturl, windowname) {
-newwin =
-window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
-}
-// end hiding -->
-</script>
-
-
-<table align="right" cellpadding=10><tr><td>
-	<a class="button" href=circulation.pl>
-	Issues</a>&nbsp;
-	<a class="buttFon" href=branchtransfers.pl>
-	Transfers</a>
-</td></tr></table>
-<h1>Circulation: Returns</h1><br>
-<b>Branch:</b> <TMPL_VAR Name="genbrname"> &nbsp;
-<b>Printer:</b> <TMPL_VAR Name="genprname"><br>
-<a href=selectbranchprinter.pl>Change Settings</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">
-	<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>Reserve Found</font></th></tr>
-		<tr><td>
-		<TMPL_IF Name="waiting">
-			<font color='red' size='+2'>Item marked Waiting:</font><br>
-		Item <TMPL_VAR Name="itemtitle"> (<TMPL_VAR Name="itemauthor">) <br>
-	is marked waiting at <b><TMPL_VAR Name="branchname"></b> for <TMPL_VAR Name="name"> (<a href="Javascript:openWindow('/cgi-bin/koha/moremember.pl?bornum=<TMPL_VAR Name="bornum">', 'Member')"><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>
-			<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>
-    Item: <TMPL_VAR Name="itemtitle"> (<TMPL_VAR Name="itemauthor">)<br>
- needs to be transfered to <b><TMPL_VAR Name="branchname"></b> <br>
-to be picked up by <TMPL_VAR Name="name"> (<a href="Javascript:openWindow('/cgi-bin/koha/moremember.pl?bornum=<TMPL_VAR Name="bornum">', 'Member')"><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>
-			<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'>Reserve found:</font> Item: <TMPL_VAR Name="itemtitle"> (<TMPL_VAR Name="itemauthor">) <a href="Javascript:openWindow('/cgi-bin/koha/detail.pl?bib=<TMPL_VAR Name="itembiblionumber">&type=intra', 'Item')"><TMPL_VAR Name="itembarcode"></a> <br>
-			for <TMPL_VAR Name="name"> (<a href="Javascript:openWindow('/cgi-bin/koha/moremember.pl?bornum=<TMPL_VAR Name="bornum">', 'Member')"><TMPL_VAR Name="borcnum"></a>) to be collected at <b><TMPL_VAR Name="branchname"></b>.
-			<table cellpadding=5 cellspacing=0>
-			<tr><td valign="top">Change status to waiting and print<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="bornum">>
-			<input type=hidden name=resbarcode value=<TMPL_VAR Name="barcode">>
-			<input type=hidden name=resslip value="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Date: <TMPL_VAR Name="today">
-
-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">
-
-BORROWER:
-<TMPL_VAR Name="bortitle"> <TMPL_VAR Name="borfirstname"> <TMPL_VAR Name="borsurname">
-card number: <TMPL_VAR Name="borcnum">
-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">
-			</form>
-			</td></tr>
-			</table>
-		</TMPL_IF>
-		</td></tr></table>
-	</td>
-	</tr>
-	<tr>
-	<td colspan=2>
-<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>Enter Book Barcode</b></font></td></tr>
-			<tr><td>Item Barcode:</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>
-		</form>
-	</td>
-	<td valign=top align=left>
-</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><td>
-			<TMPL_LOOP Name="errmsgloop">
-				<font color='red' size='+2'>
-				<TMPL_IF Name="badbarcode">
-					No Item 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 Issue.
-				</TMPL_IF>
-				<TMPL_IF Name="waslost">
-					Item was lost, now found.
-				</TMPL_IF>
-				<TMPL_IF Name="withdrawn">
-					Item Cancelled
-				</TMPL_IF>
-				</font>
-				<BR>
-			</TMPL_LOOP>
-		</td></tr></table>
-	</td>
-	</tr>
-<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>Returned Item Information</font></th></tr>
-		<tr><td>
-		Title: <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>Borrower Information</b></font></td></tr>
-		<tr><td colspan=2>
-		<a href="Javascript:openWindow('/cgi-bin/koha/moremember.pl?bornum=<TMPL_VAR Name="ribornum">','Member')"><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>Flags</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="Javascript:openWindow('/cgi-bin/koha/pay.pl?bornum=<TMPL_VAR Name="bornum">', 'Payment')">Payment</a></td></tr>
-				</TMPL_IF>
-				<TMPL_IF Name="waiting">
-					<td bgcolor=<TMPL_VAR Name="color">>
-					<TMPL_LOOP Name="itemloop">
-						<a href="Javascript:openWindow('/cgi-bin/koha/detail.pl?bib=<TMPL_VAR Name="biblionum">&type=intra','Item')"><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="Javascript:openWindow('/cgi-bin/koha/detail.pl?bib=<TMPL_VAR Name="biblionum">&type=intra', 'Item')">
-							<TMPL_VAR Name="barcode">
-						</a>
-						<TMPL_VAR Name="title">
-						<br>
-					</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>
-	</table>	
-	</td>
-	<tr>
-</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>Returned Items</font></th></tr>
-		<tr><th>Due Date</th><th>Bar Code</th><th>Title</th><th>Author</th><th>Type</th><th>Borrower</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">
-						</font>
-					</TMPL_IF>
-				<TMPL_ELSE>
-					Not on Issue.
-				</TMPL_IF>
-			</td>
-			<td bgcolor=<TMPL_VAR Name="color">> align=center>
-			<a href="Javascript:openWindow('/cgi-bin/koha/detail.pl?bib=<TMPL_VAR Name="itembiblionumber">&type=intra', 'Item')"><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="Javascript:openWindow('/cgi-bin/koha/moremember.pl?bornum=<TMPL_VAR Name="bornum">','Member')">
-					<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>
-		</table>
-	</td></tr>
-</TMPL_IF>
-
-</table>
-
-<TMPL_INCLUDE Name="circulation-bottom.inc">
diff --git a/koha-tmpl/intranet-tmpl/unido/en/images/intranet-logo.gif b/koha-tmpl/intranet-tmpl/unido/en/images/intranet-logo.gif
deleted file mode 100644
index 050180617b14d7d7c3864be914ca95fd0e2d9e49..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1669
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
P)0*1!rZ|0R1ONa#N@KD$

diff --git a/koha-tmpl/intranet-tmpl/unido/en/images/unido-intranet-photos.jpg b/koha-tmpl/intranet-tmpl/unido/en/images/unido-intranet-photos.jpg
deleted file mode 100644
index be6833b07df04f66ac40b24174516ee10a65507d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 26066
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%0AE*QS9e{J?_dvd9
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

diff --git a/koha-tmpl/intranet-tmpl/unido/en/includes/2-column-end.inc b/koha-tmpl/intranet-tmpl/unido/en/includes/2-column-end.inc
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/koha-tmpl/intranet-tmpl/unido/en/includes/3-column-end.inc b/koha-tmpl/intranet-tmpl/unido/en/includes/3-column-end.inc
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/koha-tmpl/intranet-tmpl/unido/en/includes/3-column-seperator.inc b/koha-tmpl/intranet-tmpl/unido/en/includes/3-column-seperator.inc
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/koha-tmpl/intranet-tmpl/unido/en/includes/acquisitions-bottom.inc b/koha-tmpl/intranet-tmpl/unido/en/includes/acquisitions-bottom.inc
deleted file mode 100644
index 809bd524c8..0000000000
--- a/koha-tmpl/intranet-tmpl/unido/en/includes/acquisitions-bottom.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-		
-		
-<td>
-
-
- <td width="32"><img src="<TMPL_VAR name="themelang">/images/holder.gif" width="40" height="1" border="0" alt="" /></td>
-</tr>
-</table>
-
-<p> &nbsp; <p>
-
-
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/unido/en/includes/acquisitions-top.inc b/koha-tmpl/intranet-tmpl/unido/en/includes/acquisitions-top.inc
deleted file mode 100644
index 4c6d4bdb45..0000000000
--- a/koha-tmpl/intranet-tmpl/unido/en/includes/acquisitions-top.inc
+++ /dev/null
@@ -1,122 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-
-<html>
-<head>
-<title>KOHA: INTRANET: Acquisitions</title>
-<link rel="stylesheet" type="text/css" href="<TMPL_VAR name="themelang">/includes/main.css">
-
-</head>
-<body>
-
-
-
-<!--
-
-TOPMENU
-
-the top menu has 2 columns, the first is for the site name 
-(usually Koha) the second is for the menu items - which aligns 
-them right as a group.  The section you are in has a "selected" class
-so you need a new menu for each section.
-
--->
-
-
-
-<table class="top-menu" width="100%" border="0">
-	<tr>
-
-	<td><a href="/cgi-bin/koha/mainpage.pl" class="logo"><h1 
-
-class="logo">Koha</h1></A></td>
-	
-	<td class="top-menuitems">
-	<a
-
-href="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet">Catalogue</a>
-	|
-	<a class="menu" href="/cgi-bin/koha/members-home.pl">Patrons</a>
-	|
-	<a class="menu" href="/cgi-bin/koha/circ/circulation.pl">Circulation</a>
-	|
-	<a  class="selected"  href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Add New 
-
-Items</a>
-	|
-	<a class="menu" href="/cgi-bin/koha/admin-home.pl">Administration</a>
-	|
-	<a class="menu" href="/cgi-bin/koha/reports-home.pl">Reports</a> 
-	|
-	<a class="menu" href="/cgi-bin/koha/mainpage.pl">Home</a>
-							
-	</td>
-				
-	</TR>
-</TABLE>
-
-		
-
-<!--
-MAIN TABLE
-
-The main table sets up a left hand colun for the sub menu and the layout of the rest of the 
-
-page.  
-We are using 2 and 3 column display tables, and there is a different set of includes for each.  
-
-
--->
-
-<p>
-
-<table border="0" cellpadding="0" cellspacing="0" width="100%">
-<tr valign="top"><td class="sidenav-box">
-
-<p>&nbsp;</p>
-
-<h4>ACQUISITIONS</h4>
-
-<UL class="sidenav">
-
-<LI class="selected" > <a 
-
-href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Add New Items</a>
-<li> <a 
-
-href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Add Periodical</a>
-						
-</ul>
-
-<h4>MAINTENANCE</h4>
-<UL class="sidenav">
-
-<li> <a href="/cgi-bin/koha/catalogue-home.pl">Edit Catalogue Record</a>
-
-</ul>
-
-
-
-<TMPL_IF NAME="loggedinusername">
-You are Logged in as: <TMPL_VAR NAME="loggedinusername"> 
-
-<UL class="sidenav">
-<li>
-<a href=/cgi-bin/koha/mainpage.pl?logout.x=1 class="logout">Log Out</a>
-</ul>
-<TMPL_ELSE>
-<UL class="sidenav">
-<li><a href=/cgi-bin/koha/opac-user.pl class="login">Log In</a>
-</ul>
-</TMPL_IF>
-
-
-<p>
-
-
-
-</td>
-
-
- <td width="32"><img src="<TMPL_VAR name="themelang">/images/holder.gif" width="40" height="1" border="0" alt="" /></td>
-
-<td>
diff --git a/koha-tmpl/intranet-tmpl/unido/en/includes/cat-bottom.inc b/koha-tmpl/intranet-tmpl/unido/en/includes/cat-bottom.inc
deleted file mode 100644
index 809bd524c8..0000000000
--- a/koha-tmpl/intranet-tmpl/unido/en/includes/cat-bottom.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-		
-		
-<td>
-
-
- <td width="32"><img src="<TMPL_VAR name="themelang">/images/holder.gif" width="40" height="1" border="0" alt="" /></td>
-</tr>
-</table>
-
-<p> &nbsp; <p>
-
-
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/unido/en/includes/cat-top.inc b/koha-tmpl/intranet-tmpl/unido/en/includes/cat-top.inc
deleted file mode 100644
index b27dc68937..0000000000
--- a/koha-tmpl/intranet-tmpl/unido/en/includes/cat-top.inc
+++ /dev/null
@@ -1,111 +0,0 @@
-<head>
-<link rel="stylesheet" type="text/css" href="<TMPL_VAR name="themelang">/includes/main.css">
-
-<title>KOHA INTRANET: Catalogue</title>
-
-</head>
-<body>
-
-
-
-<!--
-
-TOPMENU
-
-the top menu has 2 columns, the first is for the site name 
-(usually Koha) the second is for the menu items - which aligns 
-them right as a group.  The section you are in has a "selected" class
-so you need a new menu for each section.
-
--->
-
-
-
-<table class="top-menu" width="100%" border="0">
-	<tr>
-
-	<td><a href="/cgi-bin/koha/mainpage.pl" class="logo"><h1 class="logo">Koha</h1></A></td>
-	
-	<td class="top-menuitems">
-	<a class="selected" href="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet">Catalogue</a>
-	|
-	<a class="menu" href="/cgi-bin/koha/members-home.pl">Patrons</a>
-	|
-	<a class="menu"href="/cgi-bin/koha/circ/circulation.pl">Circulation</a>
-	|
-	<a class="menu"href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Add New Items</a>
-	|
-	<a class="menu"href="/cgi-bin/koha/admin-home.pl">Administration</a>
-	|
-	<a class="menu" href="/cgi-bin/koha/reports-home.pl">Reports</a> 
-	|
-	<a class="menu" href="/cgi-bin/koha/mainpage.pl">Home</a>
-							
-	</td>
-				
-	</TR>
-</TABLE>
-
-
-		
-		
-
-<!--
-MAIN TABLE
-
-The main table sets up a left hand colun for the sub menu and the layout of the rest of the page.  
-We are using 2 and 3 column display tables, and there is a different set of includes for each.  
-
-
--->
-
-<p>
-
-<table border="0" cellpadding="0" cellspacing="0" width="100%">
-<tr valign="top"><td class="sidenav-box">
-
-<p>&nbsp;</p>
-
-<h4>CATALOGUE</h4>
-
-<UL class="sidenav">
-
-<LI class="selected" > <a href="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet">Search</a>
-<li> <a href="/cgi-bin/koha/loadmodules.pl?module=search&marc=1&type=intranet">MARC search</a>
-						
-</ul>
-
-<h4>MAINTENANCE</h4>
-<UL class="sidenav">
-<li> <b>Edit Catalogue Record:</b> To edit a record first search for it here. When you get to the details page you will be able to edit it.
-<li> <a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions&type=intranet">Add New Item</a>
-<!--<li> <a href="/cgi-bin/koha/maint/catmaintain.pl">Subject
-Maintenance</a>-->
-</ul>
-
-
-
-<TMPL_IF NAME="loggedinusername">
-You are Logged in as: <TMPL_VAR NAME="loggedinusername"> 
-
-<UL class="sidenav">
-<li>
-<a href=/cgi-bin/koha/mainpage.pl?logout.x=1 class="logout">Log Out</a>
-</ul>
-<TMPL_ELSE>
-<UL class="sidenav">
-<li><a href=/cgi-bin/koha/opac-user.pl class="login">Log In</a>
-</ul>
-</TMPL_IF>
-
-
-<p>
-
-
-
-</td>
-
-
- <td width="32"><img src="<TMPL_VAR name="themelang">/images/holder.gif" width="40" height="1" border="0" alt="" /></td>
-
-<td>
diff --git a/koha-tmpl/intranet-tmpl/unido/en/includes/general-end.inc b/koha-tmpl/intranet-tmpl/unido/en/includes/general-end.inc
deleted file mode 100644
index 1073a439cb..0000000000
--- a/koha-tmpl/intranet-tmpl/unido/en/includes/general-end.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-		
-		
-<td>
-
-
- <td width="32"><img src="/images/holder.gif" width="40" height="1" border="0" alt="" /></td>
-</tr>
-</table>
-
-<p> &nbsp; <p>
-
-
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/unido/en/includes/general-first-column-divider.inc b/koha-tmpl/intranet-tmpl/unido/en/includes/general-first-column-divider.inc
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/koha-tmpl/intranet-tmpl/unido/en/includes/general-top.inc b/koha-tmpl/intranet-tmpl/unido/en/includes/general-top.inc
deleted file mode 100644
index 68123f68a6..0000000000
--- a/koha-tmpl/intranet-tmpl/unido/en/includes/general-top.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-<!--General-top.inc-->
-
-
-
-
-<!--End of general-top.inc-->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/unido/en/includes/home-modern.css b/koha-tmpl/intranet-tmpl/unido/en/includes/home-modern.css
deleted file mode 100644
index dc219f1fbf..0000000000
--- a/koha-tmpl/intranet-tmpl/unido/en/includes/home-modern.css
+++ /dev/null
@@ -1,32 +0,0 @@
-input.ok  {
-  background-color: #d59b61;
-  font-family: arial, helvetica, sans-serif;
-  font-size: 14px;
-  font-weight: bold;
-
-  text-align: center;
-  border: 1px;
-  border-color: #000000;
-  border-style: solid;
-  padding: 4px;
- height : 28px;
-}
-
-
-.search-heading {
-   
-  margin-bottom: 44px;
-  line-height: 60px;
-   
-}
-
-
-h1 {
-  font-family: ocean sans, garamond, times, serif;
-  font-size: 48px;
-  font-weight: normal;
-  font-style: italic;
-  margin-bottom: 44px;
-  line-height: 60px; 
-
-  }
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/unido/en/includes/login.inc b/koha-tmpl/intranet-tmpl/unido/en/includes/login.inc
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/koha-tmpl/intranet-tmpl/unido/en/includes/main.css b/koha-tmpl/intranet-tmpl/unido/en/includes/main.css
deleted file mode 100644
index c085a23d23..0000000000
--- a/koha-tmpl/intranet-tmpl/unido/en/includes/main.css
+++ /dev/null
@@ -1,418 +0,0 @@
-
-
-body {
-  background-color: #FFFFFF;
-  font-family: arial,helvetica, san-serif;
-  font-size: 12px;
-  margin: 0px;
-  padding: 0px;
-}
-
-p,ul,ol,li {
-  font-family: arial,helvetica,san-serif;
-  font-size: 12px;
-  line-height: 20px;
-}
-
-td {
-  font-family: arial,helvetica,san-serif;
-  font-size: 12px;
-}
-
-
-
-a {
-	color: #E36F00;
-	font-weight:bold;}
-
-a:visited {
-	color: #003CD8;
-	font-weight:bold;}
-
-
-
-a:hover {
-	background:#D6F96A;
-	color:#000000;
-	
-	
-	}
-
-
-h1,h2,h3,h4 {
-  color: #55127B;
-  font-family: "arial narrow",arial,helvetica;}
-
-
-h1 {
-  font-size: 28px;
-  margin-bottom: 0px;
-  padding-bottom: 0px;
-  
-}
-
- 
-h2 {
- 
-  font-size: 24px;
-  margin-bottom: 8px;
-  padding-bottom: 4px;
-  
-}
-
-h3 {
-  
-  font-size: 20px;
-  margin-bottom: 0px;
-  padding-bottom: 0px;
-}
-
-h4 {
-  
-  font-size: 16px;
-  margin-bottom: 0px;
-  padding-bottom: 0px;
-}
-
-
-table.content {
-	padding:opx;
-	margin:0px;
-
-}
-
-table.data {padding:opx;
-	margin:0px;}
-
-	
-.column-first{
-	border-right: 1px;
-  	border-color: #55127B;
-  	border-style: solid;
-    border-top: 0px;
-	border-left: 0px;
-	border-bottom: 0px;
-	padding-right:8px; 
-	line-height: 28px;
-	
-
-}
-
-.column-middle{
-	border-right: 1px;
-  	border-color: #55127B;
-  	border-style: solid;
-    border-top: 0px;
-	border-left: 0px;
-	border-bottom: 0px;
-	padding-right,:8px; 
-	padding-left:8px; 
-	line-height: 28px;
-}
-
-
-
-.column-last{
-	border-right: 0px;
-  	border-color: #55127B;
-  	border-style: solid;
-    border-top: 0px;
-	border-left: 0px;
-	border-bottom: 0px;
-	padding-right,:8px; 
-	padding-left:8px; 
-	line-height: 24px;
-}
-
-
-
-
-
-.crumb {
-  color: #000000;
-  font-weight: normal;
-}
-
-.crumb a:link {
-  color: #CC9966;
-  font-weight: normal;
-}
-
-.crumb a:visited {
-  color: #666666;
-  font-weight: normal;
-}
-
-.crumb a:hover {
-  background-color: #D6F96A;
-  color: #000000;
-}
-
-.data-header td {
-	font-weight: bold;
-	border-bottom: 1px;
-	border-color: #55127B;
-  border-style: solid;
-	}
-
-	.delete{
-  background-color: #e1d9a6;
-  border: 1px;
-  border-color: #000000;
-  border-style: solid;
-  color: #C57619;
-  font-family: arial,hevetica,sans-serif;
-  font-size: small;
-  font-weight: bold;
-  padding: 4px;
- height : 30px;
-}
-
-
-.go {
-  color: #FEEDDB;
-  background-color: #C57619;
-  border: 1px;
-  border-color: #000000;
-  border-style: solid;
-  font-family: arial,hevetica,sans-serif;
-  font-size: small;
-  font-weight: bold;
-  padding: 4px;
- height : 30px;
-}
-
-
-
-input.field { width:  300px;
-        height : 30px;
-	border: solid 1px #000000;
-	font-family: "arial narrow",arial,helvetica,sans-serif;
-	font-size: 21px;
-	line-height: 24px;
-	margin-bottom: 0px;
-	padding-bottom: 2px;
-	
-
-}
-
-
-input.short-field { width:  150px;
-	 height : 30px;
-	border: solid 1px #000000;
-	font-family: "arial narrow",arial,helvetica,sans-serif;
-	font-size: 21px;
-	line-height: 24px;
-	margin-bottom: 0px;
-	padding-bottom: 2px;
-	
-
-}
-
-input.mid-field { width:  250px;
-  height : 30px;
-	border: solid 1px #000000;
-	font-family: "arial narrow",arial,helvetica,sans-serif;
-	font-size: 21px;
-	line-height: 24px;
-	margin-bottom: 0px;
-	padding-bottom: 2px;
-	
-
-}
-
-
-input.checkbox {}
-
-.label {
-	font-family: "arial narrow",arial,helvetica,sans-serif;
-	font-weight: bold;
-}
-
-.reset {
-  background-color: #A88050;
-  border: 1px;
-  border-color: #000000;
-  border-style: solid;
-  color: #FEEDDB;
-  font-family: verdana,arial,hevetica;
-  font-size: small;
-  font-weight: bold;
-  padding: 4px;
-}
-
-
-td.heading {padding-top: 32px;}
-
-
-.tip { 
-color:#AB89BB;
-line-height:32px; }
-
-.tip-big {
-     	font-size: 32pt;
-        font-family: ocean-sans, times,serif;
-		font-style: oblique;
-		
-	
-}
-
-
-
-.top-menu {
-  background-color: #8BC638;
-border-top: 0px;
-border-left: 0px;
-border-right: 0px;
-  border-bottom: 1px;
-  border-color: #000000;
-  border-style: solid;
-  margin: 0px;  
-}
-
-
-.top-menuitems {
-  text-align: right;
- padding-right: 20px;
-}
-
-.top-menuitems a {
-color:#003CD8;
-}
-
-
-
-h1.logo {
-  margin-left: 20px;
-  margin-bottom: 4px;
-  margin-top: 4px;
-  color: #000000;
-  
-}
-
-a.logo{
- color: #000000;
- font-size: #24px;
-}
-
-a:hover.logo {
-	color:000000;
-	background:#D6F96A;
-	padding:0px;}
-
-
-a.selected {
-	
-	color:#FFFFFF;
-	
-	}
-	
-	
-a:visted.selected {
-	
-	color:#FFFFFF;
-	
-	}
-
-a:hover.selected {
-	
-	color:#000000;
-	
-	}
-
-
-
-
-
-.sidenav-box {
-  background-color: #E7F4D8;
-  padding-left: 20px;  
-  padding-right: 4px;  
-  border-bottom: 1px;
-  border-top: 1px;
-  border-left: 0px;
-  border-right: 1px;
-  border-color: #A2BB64; 
-  border-style: solid;
-  width: 150px;
-  
-  
-}
-
-.sidenav ul {
-  list-style-image: url(/images/styles/nav-dot.gif);
-  list-style-position: outside;
-  list-style-type: disc;
-  margin-left: 16px;
-  margin-top: 2px;
-  padding-left: 0px;
-  padding-top: 2px;
-
-  font-size: 9pt;
-  font-weight: normal;
-  line-height: 13px;
-  margin-bottom: 3pt;
-}
-
-
-.sidenav a:hover {
-  background: #ffffff;
-  color: #000000;
-}
-
-
-
-
-
-
-
-.button {
-  color: #FEEDDB;
-  background-color: #C57619;
-  border: 1px;
-  border-color: #000000;
-  border-style: solid;
-  font-family: arial,hevetica,sans-serif;
-  font-size: small;
-  font-weight: bold;
-  padding: 4px;
- height : 30px;
-
-	
-	
-}
-
-#menubar {
-	border-top:1px solid #666666;
-	font: 1.2em sans-serif;
-	background-color:#DDDDDD;
-}
-#submenu {
-	font: 0.5em sans-serif;
-	background-color:#EEEEEE;
-	border-left:1px solid #000000;
-}
-a.submenu {
-	font-weight: normal;
-	text-decoration: none;
-	cursor: hand;
-	color:#777777;
-	padding:4px;
-	font-weight: bold;
-	margin:0;
-}
-
-h2.underline {
-	border-style: solid;
-	border-color: #55127B;
-	border-top: 0px;
-border-left: 0px;
-border-right: 0px;
-  border-bottom: 1px;
-line-height:24px;
-padding-top:4px;
-padding-bottom:4px;
-margin-top: 12px;
-margin-bottom: 12px;
-
-}
diff --git a/koha-tmpl/intranet-tmpl/unido/en/includes/members-bottom.inc b/koha-tmpl/intranet-tmpl/unido/en/includes/members-bottom.inc
deleted file mode 100644
index 809bd524c8..0000000000
--- a/koha-tmpl/intranet-tmpl/unido/en/includes/members-bottom.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-		
-		
-<td>
-
-
- <td width="32"><img src="<TMPL_VAR name="themelang">/images/holder.gif" width="40" height="1" border="0" alt="" /></td>
-</tr>
-</table>
-
-<p> &nbsp; <p>
-
-
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/unido/en/includes/members-top.inc b/koha-tmpl/intranet-tmpl/unido/en/includes/members-top.inc
deleted file mode 100644
index ffd306098b..0000000000
--- a/koha-tmpl/intranet-tmpl/unido/en/includes/members-top.inc
+++ /dev/null
@@ -1,117 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-
-<html>
-<head>
-<title>KOHA: INTRANET: Patrons</title>
-<link rel="stylesheet" type="text/css" href="<TMPL_VAR name="themelang">/includes/main.css">
-
-</head>
-<body>
-
-
-
-<!--
-
-TOPMENU
-
-the top menu has 2 columns, the first is for the site name 
-(usually Koha) the second is for the menu items - which aligns 
-them right as a group.  The section you are in has a "selected" class
-so you need a new menu for each section.
-
--->
-
-
-
-<table class="top-menu" width="100%" border="0">
-	<tr>
-
-	<td><a href="/cgi-bin/koha/mainpage.pl" class="logo"><h1 
-
-class="logo">Koha</h1></A></td>
-	
-	<td class="top-menuitems">
-	<a
-
-href="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet">Catalogue</a>
-	|
-	<a class="selected"  href="/cgi-bin/koha/members-home.pl">Patrons</a>
-	|
-	<a class="menu" href="/cgi-bin/koha/circ/circulation.pl">Circulation</a>
-	|
-	<a  class="menu" href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Add New 
-
-Items</a>
-	|
-	<a class="menu" href="/cgi-bin/koha/admin-home.pl">Administration</a>
-	|
-	<a class="menu" href="/cgi-bin/koha/reports-home.pl">Reports</a> 
-	|
-	<a class="menu" href="/cgi-bin/koha/mainpage.pl">Home</a>
-							
-	</td>
-				
-	</TR>
-</TABLE>
-
-		
-
-<!--
-MAIN TABLE
-
-The main table sets up a left hand colun for the sub menu and the layout of the rest of the 
-
-page.  
-We are using 2 and 3 column display tables, and there is a different set of includes for each.  
-
-
--->
-
-<p>
-
-<table border="0" cellpadding="0" cellspacing="0" width="100%">
-<tr valign="top"><td class="sidenav-box">
-
-<p>&nbsp;</p>
-
-<h4>PATRONS</h4>
-
-<UL class="sidenav">
-
-<LI> <a href="/cgi-bin/koha/members-home.pl" class="submenu">Patron home</a>
-<li> <a href="/cgi-bin/koha/simpleredirect.pl?type=Add&chooseform=adult" class="submenu">Add patron</a>
-<li> <a href="/cgi-bin/koha/simpleredirect.pl?type=Add&chooseform=organisation" class="submenu">Add organisation</a>
-						
-						
-</ul>
-
-
-
-
-<TMPL_IF NAME="loggedinusername">
-You are Logged in as: <b><TMPL_VAR NAME="loggedinusername"></b>
-
-<UL class="sidenav">
-<li>
-<a href=/cgi-bin/koha/mainpage.pl?logout.x=1 class="logout">Log Out</a>
-</ul>
-<TMPL_ELSE>
-<UL class="sidenav">
-<li><a href=/cgi-bin/koha/opac-user.pl class="login">Log In</a>
-</ul>
-</TMPL_IF>
-
-
-<p>
-
-
-
-</td>
-
-
- <td width="32"><img src="<TMPL_VAR name="themelang">/images/holder.gif" width="40" height="1" border="0" alt="" /></td>
-
-<td>
-
-
-
diff --git a/koha-tmpl/intranet-tmpl/unido/en/intranet-main.tmpl b/koha-tmpl/intranet-tmpl/unido/en/intranet-main.tmpl
deleted file mode 100644
index 4ac24ea1b7..0000000000
--- a/koha-tmpl/intranet-tmpl/unido/en/intranet-main.tmpl
+++ /dev/null
@@ -1,134 +0,0 @@
-<HTML>
-<TITLE>WELCOME TO THE UBIDO KOHA INTRANET </TITLE>
-
-
-<style type="text/css">
-<!--
-
-@import url(<TMPL_VAR NAME='themelang'>/includes/css/home-modern.css);
-
-input{font-size:16px}
-
-.search-heading {
-  font-family: arial, helvetica, sans-serif;
-  font-size: 18px;
-  font-weight: normal;
-}
-
-
-
-h1 {
-  font-family: ocean sans, garamond, times, serif;
-  font-size: 48px;
-  font-weight: normal;
-  font-style: italic;
-
-  }
-  
-.menu {
-  background: #CCE699;
-  font-family: arial, helvetica, sans-serif;
-  font-size: 12px;
-  margin-top: 24px;
-  padding: 10px;
-  border: 1px;
-  border-color: #000000;
-  border-style: solid;
-  }
-  
-a {    font-weight: bold;}
-  
-  .credit {
-  font-family: arial, helvetica, sans-serif;
-  font-size: 9px;
-  font-weight: bold;
-  margin-left: 0px;
-  margin-top: 0px;
-  }
--->
-
-</style>
-
-</HEAD>
-
-<BODY
-	BGCOLOR="#99cc33"
-	text="black"
-
-text="black" 
-link="#0066FF" 
-vlink="#0066FF" 
-alink="#000000" 
-leftmargin=0 
-topmargin=0
-marginheight=0
-marginwidth=0 >
-
-
-	 
-	 <table cellspacing=0 cellpadding=0 border=0 align="center">
-<tr valign=top >
-<td>
-
-<img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=198 height=44  alt=" " hspace=0 vspace=0>
-</td>
-
-<td colspan="3">
-
-<img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=198 height=44  alt=" " hspace=0 vspace=0>
-</td>
-<td>
-
-<img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=198 height=44  alt=" " hspace=0 vspace=0>
-</td>
-</tr>
-
-<tr valign=top >
-<td width=198 height=136 align="right">
-<img src="<TMPL_VAR NAME='themelang'>/images/intranet-logo.gif" width=72 height=67 
-alt="UNIDO Logo " hspace=0 vspace=0>
-</td>
-<td colspan="3"><h1>
- UNIDO Library<br>
- Intranet</h1>
- </td></tr>
- 
- 
- <tr>
-<td align="right" rowspan="2"  valign=bottom ><img src="<TMPL_VAR NAME='themelang'>/images/unido-intranet-photos.jpg" width="198" height="198" border="0" alt="Photos of Wellington">
-<td>
- <FORM ACTION="/cgi-bin/koha/loadmodules.pl" method=post>
-				<input type="hidden" name="module" value="search">
-				<input type="hidden" name="type" value="intranet">
-<span class="search-heading">Search</span></td>
-
-<td><input type=text size="24" name="keyword"> <input type="submit" value="OK" class="ok"></td>
-
-
-</form>
-</tr>
-<tr><TD></TD>
-<td>
-<div class="menu"><a href="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet">Catalogue:</a> View and edit records  <p>
-<a href="/cgi-bin/koha/members-home.pl">Patrons:</a> Add new patrons, view and edit records, set passwords<p>
-<A href="/cgi-bin/koha/circ/circulation.pl">Circulation:</a>  Issue and return items<p>
-<A href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Add new items:</a> Add all new itmes here<p>
-<A href="/cgi-bin/koha/admin-home.pl" >Administration: </a>Koha settings, about Koha<p>
-<A href="/cgi-bin/koha/reports-home.pl">Reports:</a> A few reports
- </div>
-<p> &nbsp; </p>
-<div class="credit">
-For more information on the koha libary system<br> 
-vist  <b><a href="http://www.koha.org">www.koha.org</a></b></center>
-</div>
-</td>
-
-</tr>
-
-
-</tr>
-
-</table>
-
-
-</html>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/unido/en/members/memberentry.tmpl b/koha-tmpl/intranet-tmpl/unido/en/members/memberentry.tmpl
deleted file mode 100644
index 2e5b7ae040..0000000000
--- a/koha-tmpl/intranet-tmpl/unido/en/members/memberentry.tmpl
+++ /dev/null
@@ -1,173 +0,0 @@
-<html><TMPL_INCLUDE NAME="members-top.inc">
-
-
-
-<div class="crumb"><a href="/cgi-bin/koha/mainpage.pl">Home</a> > <a href=/cgi-bin/koha/members-home.pl">Patrons</a> > Patron Details</div>
-
-<h1><TMPL_VAR NAME=header></h1><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>">
-
-	<table border=1 cellspacing=0 cellpadding=5 >
-
-	<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'>Patron# <TMPL_VAR NAME=member>, UNIDO ID Card Number* <input type=text name=cardnumber size=10 value="<TMPL_VAR NAME=cardnumber>"><br>
-
-Expirey Date <input type=text name=expiry value="<TMPL_VAR NAME=expiry>" size="10">
-</td>
-	</tr>
-
-	<tr valign=top bgcolor="99cc33">
-		<td COLSPAN=3><B>PERSONAL DETAILS</b></td>
-		<td COLSPAN=2>
-		</td>
-	</tr>
-
-	<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>
-	</tr>
-	<tr valign=top bgcolor=white>
-		<td><TMPL_VAR name="Mr">
-		<SELECT NAME="title">
-			<option<TMPL_VAR name="title_selected_ "> value=" ">No Title</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>
-	</tr>
-
-
-	<tr valign=top bgcolor=white>
-		
-		<td colspan=2>&nbsp;</td><td colspan=2>&nbsp;</td>
-		
-		<td><FONT SIZE=2><b>Membership Category*</b></FONT></td>
-	</tr>
-	<tr valign=top bgcolor=white>
-		<td colspan=2>
-			
-			</td>
-			
-			<td colspan=2>&nbsp;</td>
-			
-		<td><TMPL_VAR NAME=catcodepopup></td>
-	</tr>
-
-
-	<tr valign=top bgcolor="99cc33" >
-		<td COLSPAN=5 ><B>CONTACT DETAILS</b></td>
-	</tr>
-
-	<tr valign=top bgcolor=white>
-		<td  COLSPAN=3><FONT SIZE=2><b>Department (or Organisation)*</b></FONT></td>
-		<td><FONT SIZE=2><b>Room</b></FONT></td>
-		<td><FONT SIZE=2>Joining Branch</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>	
-			<input type=text name="suburb" size=20 value="<TMPL_VAR NAME="suburb">">
-			
-		</td>
-		<td>
-			<TMPL_VAR name="CGIbranch">
-		</td>
-	</tr>
-
-
-
-	<tr valign=top bgcolor=white>
-		<td COLSPAN=2 ><FONT SIZE=2>Phone</td>
-		<td><FONT SIZE=2>Phone (Home)</td>
-		<td><FONT SIZE=2>Email</td>
-		<td><FONT SIZE=2>Mobile</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=phoneday>"></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="99cc33">
-		<td  COLSPAN=5><B>ALTERNATECONTACT DETAILS</b></td>
-	</tr>
-
-	<tr valign=top bgcolor=white>
-		<td   COLSPAN=3 ><FONT SIZE=2><b>Name</b></td>
-		<td><FONT SIZE=2>Phone</td>
-		<td><FONT SIZE=2><b>Relationship</b></td>
-	</tr>
-	<tr valign=top bgcolor=white>
-		<td COLSPAN=3 ><input type=text name=contactname size=20 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>
-		</select>
-		</td>
-	</tr>
-
-	<tr valign=top bgcolor=white>
-		<td><FONT SIZE=2>Notes</font></td>
-		<td COLSPAN=4><textarea name=altnotes wrap=physical cols=40 rows=3><TMPL_VAR NAME=altnotes></textarea></td>
-	</tr>
-
-
-	<tr valign=top bgcolor="99cc33">
-		<td  COLSPAN=5 ><B>LIBRARY USE</B></td>
-	</tr>
-
-	<tr valign=top >
-		<td><FONT SIZE=2>Notes</font></td>
-		<td COLSPAN=4><textarea name=borrowernotes wrap=physical cols=40 rows=3><TMPL_VAR NAME=borrowernotes></textarea></td>
-	</tr>
-
-	<TMPL_IF NAME=modify>
-		<tr><td COLSPAN=5><Font size=2>FLAGS</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>>Yes
-			<input type=radio name="<TMPL_VAR NAME=name>" value="0" <TMPL_VAR NAME=no>>No
-			</td>
-		</tr>
-		</TMPL_LOOP>
-	</TMPL_IF>
-
-
-	<tr>
-		<td></td>
-		<td>
-			<input type="submit" value="save" class="go">
-		</td>
-	</tr>
-	</table>
-</form>
-
-<TMPL_INCLUDE NAME="members-bottom.inc">
-
diff --git a/koha-tmpl/intranet-tmpl/unido/en/members/members-home.tmpl b/koha-tmpl/intranet-tmpl/unido/en/members/members-home.tmpl
deleted file mode 100644
index 3eacbf9f7e..0000000000
--- a/koha-tmpl/intranet-tmpl/unido/en/members/members-home.tmpl
+++ /dev/null
@@ -1,33 +0,0 @@
-<TMPL_INCLUDE NAME="members-top.inc">
-
-
-
-<div class="crumb"><a href="/cgi-bin/koha/mainpage.pl">Home</a> > Patrons</div>
-
-
-<h1>Patrons</h1><P>
-
-
-
-<FORM ACTION="/cgi-bin/koha/member.pl" method=post>
-
-<h2>Patron Search</h2>
-<span class="lable">Patron number, name or part of name:</span> 
-
-<INPUT TYPE="text" name="member" class="field" />
-<input type="submit" value="Go" class="go"/>
-<p>
- 
-<div class="tip"><span class="tip-big">tip</span> <span class="tip-text">renew items patrons have out on loan, view add, modify and delete patron records, all by starting with this search.<br><br>
-
-Type a borrower name, part of a name,  or number in the field above and hit the <BR>
-enter key to activate search
-</span></div>
-
-
-</form>
- 
-<P>
-
-<P>
-<TMPL_INCLUDE NAME="members-bottom.inc">
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/unido/en/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/unido/en/members/moremember.tmpl
deleted file mode 100644
index daf374989c..0000000000
--- a/koha-tmpl/intranet-tmpl/unido/en/members/moremember.tmpl
+++ /dev/null
@@ -1,186 +0,0 @@
-<TMPL_INCLUDE NAME="members-top.inc">
-
-<!-- main site -->
-
-
-
-
-<div class="crumb"><a href="/cgi-bin/koha/mainpage.pl">Home</a> > <a href=/cgi-bin/koha/members-home.pl">Patrons</a> > Patron Details</div>
-
-<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"><B>PATRON RECORD</TD>
-	</TR>
-
-	<tr VALIGN=TOP  >
-	<TD>
-		
-		
-		<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>
-		Location: <TMPL_VAR NAME="address">, <TMPL_VAR name="suburb"><BR>
-	
-		Phone: <TMPL_VAR NAME="phone"><BR>
-		
-		Phone (Home): <TMPL_VAR NAME="phoneday"><BR>
-		
-		E-mail: <a href="mailto:<TMPL_VAR NAME="emailaddress">"><TMPL_VAR NAME="emailaddress"></a><br>
-		Mobile: <TMPL_VAR NAME="textmessaging"><p>
-		Membership Number: <TMPL_VAR NAME="borrowernumber"><BR>
-		Membership Category: <TMPL_VAR NAME="categorycode"><BR>
-		
-		Joined: <TMPL_VAR NAME="dateenrolled">,  Expires: <TMPL_VAR NAME="expiry"><BR>
-		Joining Branch: <TMPL_VAR NAME="branchcode"><P>
-		<TMPL_IF NAME="printethnicityline">
-			Ethnicity: <TMPL_VAR NAME="ethnicity">, <TMPL_VAR NAME="ethnotes"><br>
-		</TMPL_IF>
-		
-		
-	<TMPL_IF NAME="contactname">	Alternative Contact: <TMPL_VAR NAME="contactname"><BR></TMPL_IF>
-		<TMPL_IF NAME="altphone">Phone: <TMPL_VAR NAME="altphone"><BR></TMPL_IF>
-		<TMPL_IF NAME="altnotes">Notes: <TMPL_VAR NAME="altnotes"><P></TMPL_IF>
-
-
-		<P>
-		<TMPL_IF NAME="borrowernotes">General Notes: 
-		<TMPL_VAR NAME="borrowernotes">
-		</TMPL_IF>
-		<p>
-		</font>
-		
-		<form action=/cgi-bin/koha/member-password.pl method=post>
-			<input type=hidden name=member value=<TMPL_VAR NAME=bornum>>
-			<input type=submit class="go" value="Set Username & Password">
-		</form>
-
-
-
-			<form action=/cgi-bin/koha/memberentry.pl method=post>
-				<input type=hidden name=bornum value="<TMPL_VAR NAME="bornum">">
-				<INPUT TYPE=submit class="go" value="Edit Contact Details">
-			</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="go" value="Change User Flags">
-		</form>
-
-		<form action=/cgi-bin/koha/deletemem.pl method=post>
-                        <input type=hidden name=member value="<TMPL_VAR NAME="bornum">">
-			<INPUT TYPE=submit class="delete" value="Delete">
-		</form>
-
-	</TD>
-	</TR>
-</TABLE>
-
-<img src="/images/holder.gif" width=16 height=800 align=left>
-
-
-
-<form action="renewscript.pl" method=post>
-	<input type="hidden" name="bornum" value="<TMPL_VAR name="bornum">">
-	<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 >
-
-	<TR VALIGN=TOP>
-		<td  bgcolor="99cc33" colspan=6><B>ITEMS CURRENTLY ON ISSUE</b></TD>
-	</TR>
-
-	<TR VALIGN=TOP>
-		<td  bgcolor="99cc33"><B>Title</b></TD>
-		<td  bgcolor="99cc33" ><B>Due</b></TD>
-		<td  bgcolor="99cc33"><B>Itemtype</b></TD>
-		<td  bgcolor="99cc33" ><B>Charge</b></TD>
-		<td  bgcolor="99cc33" ><b>Renew</b></TD>
-	</TR>
-
-	<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">
-		</a>
-		</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">">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>
-
-	<tr VALIGN=TOP  >
-		<TD colspan=5 align=right>
-		<INPUT TYPE=submit class="go" VALUE="Renew Items">
-		</td>
-	</tr>
-
-	</table>
-</form>
-
-<P>
-
-<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 >
-	<TR VALIGN=TOP>
-		<td  bgcolor="99cc33"colspan=5><B>ITEMS REQUESTED</b></TD>
-	</TR>
-
-	<TR VALIGN=TOP>
-		<td  bgcolor="99cc33"><B>Title</b></TD>
-		<td  bgcolor="99cc33" ><B>Requested</b></TD>
-		<td  bgcolor="99cc33" ><B>Remove</b></TD>
-	</TR>
-
-	<form action=/cgi-bin/koha/modrequest.pl method=post>
-	<input type=hidden name=from value=borrower>
-
-	<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>
-		</td>
-		<td><TMPL_VAR NAME="reservedate2"></td>
-		<td>
-			<select name="rank-request">
-			<option value=n>No
-			<option value=del>Yes
-			</select>
-		</td>
-		<input type=hidden name=biblio value="<TMPL_VAR NAME="biblionumber">">
-		<input type=hidden name=borrowernumber value="<TMPL_VAR NAME="bornum">">
-	</tr>
-	</TMPL_LOOP>
-
-	<tr VALIGN=TOP  >
-		<td colspan=5 align=right>
-		<TMPL_IF name="reserveloop">
-			<INPUT TYPE="image" name="submit" VALUE="save" class="go">
-		</TMPL_IF>
-		</td>
-	</tr>
-	</form>
-</table>
-<br />
-<br />
-<a href="/cgi-bin/koha/readingrec.pl?bornum=<TMPL_VAR NAME="bornum">">Reading Record</a>
-
-<!-- endmenu -->
-
-<TMPL_INCLUDE NAME="members-bottom.inc">
diff --git a/koha-tmpl/intranet-tmpl/unido/en/modbib.tmpl b/koha-tmpl/intranet-tmpl/unido/en/modbib.tmpl
deleted file mode 100644
index cd5c3fd346..0000000000
--- a/koha-tmpl/intranet-tmpl/unido/en/modbib.tmpl
+++ /dev/null
@@ -1,108 +0,0 @@
-<html>
-
-<TMPL_INCLUDE Name="cat-top.inc">
-
-<div class="crumb"><a href="/cgi-bin/koha/mainpage.pl">Home</a> > <a href="/cgi-bin/koha/catalogue-home.pl">Catalogue Search</a> >
-Edit Biblio</div>
-
-<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">">
-
-<h1>Bibliographic Record Number <TMPL_VAR Name="biblionumber"></h1>
-If the field you are looking for isn't here, check the group record.
-
-<table border="0" cellspacing="0" cellpadding="5">
-
-
-
-
-<tr valign="top">
-<td colspan=2><h2>Edit Record</h2></td>
-
-</tr>
-
-
-<tr valign="top">
-<td>Title</td>
-<td><input type="text" name="title" value="<TMPL_VAR Name="title" ESCAPE=HTML>"></td>
-</tr>
-
-<tr valign="top">
-<td>Subtitle</td>
-<td><input type="text" name="subtitle" value="<TMPL_VAR Name="subtitle" ESCAPE=HTML>"></td>
-</tr>
-
-<tr valign="top">
-<td>Author</td>
-<td><input type="text" name="author" value="<TMPL_VAR Name="author" ESCAPE=HTML>"></td>
-</tr>
-
-<tr valign="top">
-<td>Additional Author <br><i>One Author per line</i></td>
-<td><textarea  name="additionalauthor" cols="40" rows="4"><TMPL_VAR Name="additionalauthor" ESCAPE=HTML></textarea></td>
-</tr>
-
-
-<tr valign="top">
-<td>Abstract</td>
-<td><textarea name="abstract" cols="40" rows="4"><TMPL_VAR Name="abstract"></textarea></td>
-</tr>
-<tr valign="top">
-<td>Subject</td>
-<td><textarea name="subject" cols="40" rows="4"><TMPL_VAR Name="subject"></textarea>
-</td>
-</tr>
-<tr valign="top">
-<td>Copyright Date</td>
-<td><input type="text" name="copyrightdate" value="<TMPL_VAR Name="copyrightdate" ESCAPE=HTML>"></td>
-</tr>
-
-<tr valign="top">
-<td>Language</td>
-<td><input type="text" name="language" value="<TMPL_VAR Name="language" ESCAPE=HTML>"></td>
-</tr>
-<tr valign="top">
-<td>Series Title</td>
-<td><input type="text" name="seriestitle" value="<TMPL_VAR Name="seriestitle" ESCAPE=HTML>"></td>
-</tr>
-
-<tr valign="top">
-<td>Conference Title</td>
-<td><input type="text" name="conference" value="<TMPL_VAR Name="conference" ESCAPE=HTML>"></td>
-</tr>
-<tr valign="top">
-<td>Unititle</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>
-</tr>
-
-
-<tr valign="top">
-<td>Additional Website Links<br>
-</td><td>
-
-
-<a href="modwebsites.pl?biblionumber=<TMPL_VAR Name="biblionumber">">Add/Edit Additional Website Links</a><br>
-<i>NOTE: The main website link it is on the group record not here.</i></td></tr>
-
-<!--tr valign="top">
-<td>Serial</td>
-<td><input type="text" name="serial" value="<TMPL_VAR Name="serial" ESCAPE=HTML>"></td>
-</tr-->
-<TR><TD></td><td><input type="submit" name="submit" value="Save" class="go"></td>
-</table>
-<br>
-
-</form>
-<script>
-function Dopop() {
-        newin=window.open("thesaurus_popup.pl?subject="+document.f.subject.value,"thesaurus",'width=500,height=400,toolbar=false,scrollbars=yes');
-}
-</script>
-
-<TMPL_INCLUDE Name="cat-bottom.inc">
diff --git a/koha-tmpl/intranet-tmpl/unido/en/modbibitem.tmpl b/koha-tmpl/intranet-tmpl/unido/en/modbibitem.tmpl
deleted file mode 100644
index 1ed853bec5..0000000000
--- a/koha-tmpl/intranet-tmpl/unido/en/modbibitem.tmpl
+++ /dev/null
@@ -1,111 +0,0 @@
-<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>
-Modify Group - <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 > RE-ASSIGN TO EXISTING GROUP</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"> - <TMPL_VAR NAME="volumeddesc"><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>
-		</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>Volume</td>
-		<td><input type=text name=Volume value="<TMPL_VAR Name="volumeddesc">" 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>
-		</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>UDC</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>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>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>Illustrations</td><td><input type=text name=Illustrations value="<TMPL_VAR Name="illustration">" 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>Size</td>
-		<td><input type=text name=Size value="<TMPL_VAR Name="size">" 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>
-
-		<input type=hidden name=bibnum value="<TMPL_VAR Name="biblionumber">">
-
-		<input type=hidden name=bibitemnum value="<TMPL_VAR Name="biblioitemnumber">">
-
-	</table>
-
-	<img src="/images/holder.gif" width=16 height=500 align=left>
-
-
-
-
-	<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>
-		</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>
-		</tr>
-
-		<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></td>
-				<td><TMPL_VAR Name="datelastseen"></td>
-			</tr>
-		</TMPL_LOOP>
-	</table>
-	<p>
-
-	<input type=submit name=submit value="save" class="go">
-
-
-</form>
-<p>
-
-<div class="tip>
-<span class="tip-big">tip:</span><span="tip-text" 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.
- </span>
- </div>
- <br clear=all>
- <p> &nbsp; </p>
-
-<TMPL_INCLUDE Name="cat-bottom.inc">
diff --git a/koha-tmpl/intranet-tmpl/unido/en/newmember.tmpl b/koha-tmpl/intranet-tmpl/unido/en/newmember.tmpl
deleted file mode 100644
index bd58d59e86..0000000000
--- a/koha-tmpl/intranet-tmpl/unido/en/newmember.tmpl
+++ /dev/null
@@ -1,229 +0,0 @@
-<TMPL_INCLUDE Name="members-top.inc">
-
-<H1> Confirm Record </H1>
-<TMPL_IF Name="OK">
-	<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> NEW MEMBER </B>
-			</td>
-		</tr>
-		<tr valign=top bgcolor="white" >
-			<td>
-				<B>Name</B>
-			</td>
-			<td>
-				<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> MEMBERSHIP DETAILS </B>
-			</td>
-		</tr>
-		<tr valign=top bgcolor="white" >
-			<td>
-				<B>Membership Number</B>
-			</td>
-			<td>
-				<TMPL_VAR Name="bornum">
-			</td>
-		</tr>
-		<tr valign=top bgcolor="white" >
-			<td>
-				<B>Card Number</B>
-			</td>
-			<td>
-				<TMPL_VAR Name="cardnum">
-			</td>
-		</tr>
-		<tr valign=top bgcolor="white" >
-			<td>
-				<B>Membership Category</B>
-			</td>
-			<td>
-				<TMPL_VAR Name="memcat">
-			</td>
-		</tr>
-		<tr valign=top bgcolor="white" >
-			<td>
-				<B>Fee</B>
-			</td>
-			<td>
-				<TMPL_VAR Name="fee">
-			</td>
-		</tr>
-		<tr valign=top bgcolor="white" >
-			<td>
-				<B>Joining Date</B>
-			</td>
-			<td>
-				<TMPL_VAR Name="joindate">
-			</td>
-		</tr>
-		<tr valign=top bgcolor="white" >
-			<td>
-				<B>Expiry Date</B>
-			</td>
-			<td>
-				<TMPL_VAR Name="expdate">
-			</td>
-		</tr>
-		<tr valign=top bgcolor="white" >
-			<td>
-				<B>Joining Branch</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>PERSONAL DETAILS</B>
-			</td>
-		</tr>
-		<tr valign=top bgcolor="white" >
-			<td>
-				<B>Date Of Birth</B>
-			</td>
-			<td>
-				<TMPL_VAR Name="dob">
-			</td>
-		</tr>
-		<tr valign=top bgcolor="white" >
-			<td>
-				<B>Sex</B>
-			</td>
-			<td>
-				<TMPL_VAR Name="sex">
-			</td>
-		</tr>-->
-		<tr valign=top bgcolor="<TMPL_VAR Name="main">" >
-			<td colspan=2 background="<TMPL_VAR name="themelang">/images/background-mem.gif">
-				<B>MEMBER ADDRESS</B>
-			</td>
-		</tr>
-		<tr valign=top bgcolor="white" >
-			<td>
-				<B>Department</B>
-			</td>
-			<td>
-				<TMPL_VAR Name="postal">
-			</td>
-		</tr>
-<!--		<tr valign=top bgcolor="white" >
-			<td>
-				<B>Home Address</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>MEMBER CONTACT DETAIL</B>
-			</td>
-		</tr>
-		<tr valign=top bgcolor="white" >
-			<td>
-				<B>Phone</B>
-			</td>
-			<td>
-				<TMPL_VAR Name="phone">
-			</td>
-		</tr>
-<!--		<tr valign=top bgcolor="white" >
-			<td>
-				<B>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>Text messaging</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>ALTERNATIVE CONTACT DETAIL</B>
-			</td>
-		</tr>
-		<tr valign=top bgcolor="white" >
-			<td>
-				<B>Name</B>
-			</td>
-			<td>
-				<TMPL_VAR Name="contactname">
-			</td>
-		</tr>
-		<tr valign=top bgcolor="white" >
-			<td>
-				<B>Phone</B>
-			</td>
-			<td>
-				<TMPL_VAR Name="altphone">
-			</td>
-		</tr>
-		<tr valign=top bgcolor="white" >
-			<td>
-				<B>Relationship</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>General Notes</B>
-			</td>
-			<td>
-				<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>
-			<input type=submit name=submit value=Submit>
-		</form>
-<TMPL_ELSE>
-	<TMPL_VAR Name="string">
-</TMPL_IF>
-
-
-<TMPL_INCLUDE Name="members-bottom.inc">
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
index 31add9c944e1cf0c1b8fcb84e4b1143c323a13f6..82c90c7827148115f1d503ccd2f4be082eb192b9 100644
GIT binary patch
delta 1540
zcmV+f2K)Jv3y=(dM@dFFIbkCJG63iQ02Cr80y#MvFESo8HyJiLBQ!oCK0zZuLk~$#
zB|=3kK}9D-Ml3=`C`L#zMoKJ6OEXAJG)hiEMMoV}Sru7bF-}n!TVD%dV>wPzG*MJ4
zR$LEbWdUkz9A9HRQdSjWYZPT@7h`NpO;t)xTQ*o=JXT+SR7+etSX)C@RZ>r0Ls?x^
zQD9b3Wkp(FR#Re9Rbxh6U{q9SPg+|^TV?=!feLtjTU2UWR$xhAV@+RPTvuTLfQ4OF
zY))ZdVpVKjS8ZKdX#s?ZQDkFLV{K1mX;@=qXj*bkXmMF&a8+n$42O(nUv*+*Yyggu
zW?*(;WO4w1kCR(zZ*E|CX=8a;ZgOC2cWY&PUT}M1aCUKLgkE%ca%hEYaC38MhG}tl
zZf|&LaD;Sfhi`Csb!&)nZi;Glc64%fcWsJuZ;N(shIep>baZ}oa*l3#dU$qvdUJ_!
zc#L~=i)(&~e07X=dwzR)eRz0{bbF6^d5(R1e|ma<k9&KNb%B9=e35;AhjoFCeSMO5
zgM)E|k9dHSetwgGfQfp6m4ktWdxDmHgO_-RjeUfefrg2Gg_(bbnt+F!dy1TdiHv-U
zoqmmzeT<%gjgEVcnud#xi;0bXjh}yxpn#8|gpiSnkCB9soqUs{hLV$jlb?Z<ppB7~
zf|a3vftZ|=k(Gm&qKKEBgqWj?mzaf_q>PxEft;q6l$eH^rIMGKf}N*>o~V?Wn}naK
znU|Y|psI$UtDBjfh@-8ZoS==QsfnepnxCPHrm&l!qMV_lqMxIlqotswsG_H;q^Yc?
ztF5iFw6n3bwX(Lhv$(Riy1BNyy12ZzyuZDFyT8A^!M?-A!N$qQ#L2_R%E`ye%gN2g
z%+Acp&d$ux%h1!%&eF}&)z8$|(%9P7+T7dN+}+yW*xuma-QnBd<L2Y&<LK+_?&|68
z@b2*K?(_EZ@%8id^6>Wf_VoDl_w)Gm`t$hv`S$zt`TY3$_xt$$_WS<%`}q3&`S<-0
z|NZ;_`~CX<{Qvy_`~Ls@k!m1+00930EC2ui03!f0000R70RIUbNU&f*0Ul&{7+|oW
zLxT<&WuxaWpTB$8=n#0waiD@;^D6T5N3tZj933B)NmsIE$&vNAq%>H}rOlT2ip&(4
zfZENU{`jG5FmpjRph%6)tcDcnJ`^2~H3iC#pD>P*rZ!!-u_2CoTAONrap-MiSfH~S
zjyl_Pn!yb3*djegQ!dba`wS3N0oLwMekuqC^9yuekAV;35&oHv$iPaAfeIP8E%MJ6
z0$W(VneTx>PG&ckj5jcvXqVy!vOC?fnLsM6OYT!8a8m4&Z3GUx?N1*BflP068(7Y!
zx@4FN9WrGtv{qIF<C5fmH*U>~FNp~0L1RNlva^o={u$Uu5}&RVfFx<!^vDsOF<E@9
zsW<hT$C3M7{lK$GQ>as-ctQvpTVx@H8RQ|=$v_JPg-r@*?9oUjpM0`OCW*|^MHpEa
zF&I$vRB+!uOpt*GA&Weci6@?DGKd~$6qv;g3EospLHdAW!W@QwEaHiZny@GdB6Fm%
z#TG1p!x#(&or8-VhBV>{C84C!N-VOx@<}3Wgt3Jb&HSWPLDcxc1|*h<a>^^W+(HW}
zuf*aBj9X0colWduU{Ek?^zq0huh5c9o4efdN-LBA^2Qc6cyrT&2Jx|m9glqSiY>eB
zB1@aEr1A)iQrr-Kl1tk-1i>0?7_!MHve0tHAJ!Fa(#U{kIN^#-^Dya<2yYPbh$pGY
zaz!0aAkqgOY@A`l8u-}62S)%z$l@oh(D4j3OvI1{5G(Y8k8}PI(@_96oVf`pvb1st
zJMMhb%r)|W>(4VY70`#2skDg&HqFZG&pf~Ev;h#6#?t0%EnXmVlQ^A7u#-Rt{Nc$f
zzPwVXB3{6fOf$n=;)NGcT=4KeN=z_FE4=vPOD?<kvP&tbTxy91G>j||6dhF23Z{hK
q@(Cq(%<zHD1=T>p5Q_XK${$FS(18*}H?#u?7Eo{j2s=a_5CA(55BRVE

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

diff --git a/koha-tmpl/opac-tmpl/css/en/includes/basket.js b/koha-tmpl/opac-tmpl/css/en/includes/basket.js
index d7b7a3cffd..4126ddd205 100644
--- a/koha-tmpl/opac-tmpl/css/en/includes/basket.js
+++ b/koha-tmpl/opac-tmpl/css/en/includes/basket.js
@@ -357,4 +357,9 @@ function updateBasket(updated_value,target) {
 document.getElementById == "undefined") {
         target.all['basket'].innerHTML = " ("+updated_value+")";
     }
+}
+
+function openBiblio(biblionumber) {
+	openerURL="opac-detail.pl?bib="+biblionumber;
+	opener.document.location = openerURL;
 }
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/css/en/includes/opac-basket-menu.inc b/koha-tmpl/opac-tmpl/css/en/includes/opac-basket-menu.inc
index cfd043a5d1..649ee31f11 100644
--- a/koha-tmpl/opac-tmpl/css/en/includes/opac-basket-menu.inc
+++ b/koha-tmpl/opac-tmpl/css/en/includes/opac-basket-menu.inc
@@ -10,4 +10,10 @@
 		<A href='javascript:printBasket()' class="menu">Print</A>
 		<span class="basketspacer">&nbsp;</span>
 		<A href='javascript:quit()' class="menu">Close</A>
+		<!-- TMPL_IF NAME="verbose" -->
+			<a href="javascript:showLess()" class="menu">Brief Display</a>
+		<!-- TMPL_ELSE -->
+			<a href="javascript:showMore()" class="menu">More Details</a>
+		<!-- /TMPL_IF -->
+
 	</div>
diff --git a/koha-tmpl/opac-tmpl/css/en/includes/opac-basket-top.inc b/koha-tmpl/opac-tmpl/css/en/includes/opac-basket-top.inc
index 72e8d9bab3..6a735ab36a 100644
--- a/koha-tmpl/opac-tmpl/css/en/includes/opac-basket-top.inc
+++ b/koha-tmpl/opac-tmpl/css/en/includes/opac-basket-top.inc
@@ -4,6 +4,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 	<title>OPAC Basket</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
 	<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang">/includes/opac.css">
 	<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/includes/basket.js"></script>
 	<script language="JavaScript" type="text/javascript">
diff --git a/koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc b/koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc
index ab49a48dae..ae76ad4289 100644
--- a/koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc
+++ b/koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc
@@ -9,6 +9,7 @@
 		<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang"-->/includes/opac.css" />
 	<!-- /TMPL_IF -->
 	<title><!--TMPL_VAR name="LibraryName"--></title>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
 	<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/includes/basket.js"></script>
 	<script language="JavaScript" type="text/javascript">
 		function _(s) { return s } // dummy function for gettext
diff --git a/koha-tmpl/opac-tmpl/css/en/includes/opac.css b/koha-tmpl/opac-tmpl/css/en/includes/opac.css
index 398acaac22..6d4f139231 100644
--- a/koha-tmpl/opac-tmpl/css/en/includes/opac.css
+++ b/koha-tmpl/opac-tmpl/css/en/includes/opac.css
@@ -1,6 +1,6 @@
 body {
 	background-color:#009999;
-	font-family:verdana,arial,helvetica;
+	font-family:verdana,arial,helvetica,sans-serif;
 	font-size:12pt;
 	margin:0px;
 	padding:0px
@@ -27,6 +27,7 @@ a:hover {
 	color:#000000;
 }
 
+/* the page result number */
 a.results {
 	background-color : #FFD9BF;
 	padding : 0px 2px 0px 2px;
@@ -39,11 +40,13 @@ a.results:hover {
 	margin : 2px 1px 2px 0px;
 }
 
+/* label size & look just before input fields */
 label {
 	float:left;
 	width: 10em;
 }
 
+/* images */
 img {
 	border-width:0px;
 	text-align:left;
@@ -56,6 +59,7 @@ img {
 	position:relative;
 }
 
+/* main title */
 h1 {
 	color:#FFD9BF;
 	background-color:#FF6600;
@@ -68,6 +72,7 @@ h1 {
 }
 
 /* style for library name, on top of menu (defined in LibraryName systempref) */
+/* in opac-main page */
 .LibraryName {
 	color:#FFD9BF;
 	background-color:transparent;
@@ -79,6 +84,7 @@ h1 {
 	width:75%;
 }
 
+/* in all other pages */
 .SmallLibraryName {
 	color:#FFD9BF;
 	background-color:transparent;
@@ -91,15 +97,17 @@ h1 {
 	margin-left:70px;
 }
 
+/* subtitles. headers of blocks */
 h2 {
 	color:#000000;
-/* 	background-color:#FF6600; */
 	background-image: url(/opac-tmpl/css/en/images/bar.gif);
 	background-repeat:repeat-y;
 	font-weight:bold;
 	font-size: 125%;
 	margin: 0px 0px 10px 0px;
 }
+
+/* probably useless */
 h3 {
 	color:#000000;
 	font-weight:bold;
@@ -107,6 +115,7 @@ h3 {
 	margin: 5px 0px 0px 0px;
 }
 
+/* paragraphs */
 p {
 	padding-left:10pt;
 	padding-bottom:0pt;
@@ -114,12 +123,15 @@ p {
 	clear:left;
 }
 
+/* centered paragraphs */
 p.center {
 	padding-left:10pt;
 	padding-bottom:0pt;
 	margin:0pt;
 	text-align:center;
 }
+
+/* the copyright (at the end of the main page */
 p.copyright {
 	border-top: 1px solid #000000;
 	margin-top:10px;
@@ -193,6 +205,7 @@ td.hilighted {
 	margin : 3px 3px 3px 0px;
 }
 
+/* standard input field */
 input {
 	border:0px;
 	border-bottom:1px solid #000000;
@@ -206,18 +219,19 @@ input:hover {
 	background-color:#FF6600;
 }
 
+/* textarea input field */
 textarea {
 	border:0px;
 	border-bottom:1px solid #000000;
 	background-color:#009999;
 }
-
 textarea:hover {
 	border:0px;
 	border-bottom:1px solid #000000;
 	background-color:#FF6600;
 }
 
+/* select input field */
 select {
 	border:0px;
 	border-bottom:1px solid #000000;
@@ -275,8 +289,8 @@ select:hover {
 
 #leftbloc {
 	float:left;
-	width=30%;
-	border:1;
+	width:30%;
+	border:0;
 }
 
 #bottombloc {
@@ -291,19 +305,17 @@ select:hover {
 /* used in members */
 #bloc20, .bloc20 {
 	float:left;
-	width:30%;
-	border:0;
 	border:1px solid #000000;
 	margin-right:20px;
 	margin-bottom:20px;
+	padding-right:20px;
 }
 #bloc60, .bloc60 {
 	float:left;
-	width:60%;
-	border:0;
 	border:1px solid #000000;
 	margin-right:20px;
 	margin-bottom:20px;
+	padding-right:20px;
 }
 
 /* used in biblio detail */
@@ -331,10 +343,7 @@ select:hover {
 }
 
 #menuline {
-/*	width:100%;
-	vertical-align:top;*/
 	float:left;
-/*	position:relative;*/
 	display:block;
 }
 
@@ -383,14 +392,11 @@ div.tab {
 	margin-top:150px;
 	margin-right:10%;
 }
-td {
-	border:0px;
-}
 
 .MARCtag { /* style for tag definition (700 - Statement of responsability) */
 	font-weight:bold;
 	color:#FF6600;
-	background-color:FFFFFF;
+	background-color:#FFFFFF;
 	background-image:none;
 	border-bottom: thin solid #FF6600;
 	margin-right:30%;
diff --git a/koha-tmpl/opac-tmpl/css/en/includes/popup-bottom.inc b/koha-tmpl/opac-tmpl/css/en/includes/popup-bottom.inc
new file mode 100644
index 0000000000..308b1d01b6
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/css/en/includes/popup-bottom.inc
@@ -0,0 +1,2 @@
+</body>
+</html>
diff --git a/koha-tmpl/opac-tmpl/css/en/includes/popup-top.inc b/koha-tmpl/opac-tmpl/css/en/includes/popup-top.inc
new file mode 100644
index 0000000000..193b82cb1f
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/css/en/includes/popup-top.inc
@@ -0,0 +1,15 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html>
+<head>
+	<title>popup</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<!-- TMPL_IF name="opacstylesheet" -->
+		<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="opacstylesheet"-->" />
+	<!-- TMPL_ELSE -->
+		<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang"-->/includes/opac.css" />
+	<!-- /TMPL_IF -->
+</head>
+
+<body>
+<!-- NO MENUS for popup-top -->
diff --git a/koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl b/koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl
index ea52bf4090..136ef692ee 100644
--- a/koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl
+++ b/koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl
@@ -6,6 +6,113 @@
 <!-- TMPL_INCLUDE NAME="opac-basket-menu.inc" -->
 <!-- /TMPL_IF -->
 <div id="mainbloc" style="margin-top:10px;margin-bottom:20px;padding-top:10px;padding-bottom:10px;">
+<!-- TMPL_IF NAME="verbose" -->
+	<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
+	<h3><!-- TMPL_VAR NAME="title" --><!-- TMPL_IF name="subtitle" --> <!-- TMPL_VAR NAME="subtitle" --><!-- /TMPL_IF --></h3>
+	<table>
+		<!-- TMPL_UNLESS NAME="print_basket" -->
+			<tr><td colspan="2">
+				<form>
+					<label for="bib<!-- TMPL_VAR NAME="biblionumber" -->">
+						<input type="checkbox" value="<!-- TMPL_VAR NAME="biblionumber" -->" name="bib<!-- TMPL_VAR NAME="biblionumber" -->" id="bib<!-- TMPL_VAR NAME="biblionumber" -->" onclick="selRecord(value,checked)"> Select this Item
+					</label>
+				</form>
+			</td></tr>
+		<!-- /TMPL_UNLESS -->
+		<!-- TMPL_IF name="isbn" -->
+			<tr>
+				<th>ISBN:</th>
+				<td><!-- TMPL_VAR NAME="ISBN" --></td>
+			</tr>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF name="author" -->
+			<tr>
+				<th>Author:</th>
+				<td> <!-- TMPL_VAR NAME="author" --></td>
+			</tr>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF name="additional" -->
+			<tr>
+				<th>Additional authors:</th>
+				<td><!-- TMPL_VAR NAME="additional" --></td>
+			</tr>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="publishercode" -->
+			<tr>
+				<th>Publisher:</th>
+				<td><!-- TMPL_VAR NAME="place" --> <!-- TMPL_VAR NAME="publishercode" --> <!-- TMPL_VAR NAME="publicationyear" --></td>
+			</tr>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="pages" -->
+			<tr>
+				<th>Details: </th>
+				<td><!-- TMPL_VAR NAME="pages" --> <!-- TMPL_VAR NAME="illus" --> <!-- TMPL_VAR NAME="size" --></td>
+			</tr>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF name="collection" -->
+			<tr>
+				<th>Collection:</th>
+				<td> <!-- TMPL_VAR NAME="seriestitle" --></td>
+			</tr>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF name="subject" -->
+			<tr>
+				<th>Subject:</th>
+				<td> <!-- TMPL_VAR NAME="subject" --></td>
+			</tr>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF name="copyrightdate" -->
+			<tr>
+				<th>Copyright:</th>
+				<td> <!-- TMPL_VAR NAME="copyrightdate" --></td>
+				</tr>
+			<!-- /TMPL_IF -->
+		<!-- TMPL_IF name="notes" -->
+			<tr>
+				<th>Notes:</th>
+				<td> <!-- TMPL_VAR NAME="notes" --></td>
+			</tr>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF name="unititle" -->
+			<tr>
+				<th>Unified title:</th>
+				<td> <!-- TMPL_VAR NAME="unititle" --></td>
+			</tr>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF name="serial" -->
+			<tr>
+				<th>Serial:</th>
+				<td><!-- TMPL_VAR NAME="serial" --></td>
+			</tr>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF name="dewey" -->
+			<tr>
+				<th>Dewey:</th>
+				<td><!-- TMPL_VAR name="dewey" --></td>
+			</tr>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF name="classification" -->
+			<tr>
+				<th>Call Number:</th>
+				<td> <!-- TMPL_VAR name="classification" --></td>
+			</tr>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF name="lccn" -->
+			<tr>
+				<th>LCCN:</th>
+				<td> <!-- TMPL_VAR name="lccn" --></td>
+			</tr>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF name="url" -->
+			<tr>
+				<th>URL:</th>
+				<td> <!-- TMPL_VAR NAME="url" --></td>
+			</tr>
+		<!-- /TMPL_IF -->
+		</table>
+	<!-- /TMPL_LOOP -->
+<!-- TMPL_ELSE -->
+
 	<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
 	<div width="100%" style="margin-top:0px;margin-bottom:0px;padding-top:10px;padding-bottom:10px;">
 	<table cellspacing="0" style="border:0;width:100%;">
@@ -20,7 +127,7 @@
 				<!-- BIBLIO RECORD TABLE -->
 				<tr>
 					<th>
-						<!-- TMPL_VAR NAME="title" -->  (record <!-- TMPL_VAR NAME="biblionumber" -->)
+						<a onClick="javascript:openBiblio(<!-- TMPL_VAR name="biblionumber" -->)"><!-- TMPL_VAR NAME="title" --></a>
 					</th>
 				</tr>
 				<tr valign="top">
@@ -51,6 +158,7 @@
 	</table>
 	</div>
 	<!-- /TMPL_LOOP -->
+<!-- /TMPL_IF -->
 </div>
 
 <!-- TMPL_UNLESS NAME="print_basket" -->
diff --git a/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl b/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl
index 016727f05f..039437a89e 100644
--- a/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl
+++ b/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl
@@ -40,30 +40,42 @@
 		<!-- BIBLIO RECORD TABLE -->
 		<tr>
 			<th>
-				<!-- TMPL_VAR NAME="title" -->  (record <!-- TMPL_VAR NAME="biblionumber" -->)
+				<!-- TMPL_VAR NAME="title" -->
 			</th>
 		</tr>
 		<tr>
 			<td>
-<!-- TMPL_IF name="subtitle" --><b>Subtitle:</b> <!-- TMPL_VAR NAME="subtitle" --><br /><!-- /TMPL_IF -->
-				<!-- TMPL_IF name="author" --><b>Author:</b> <!-- TMPL_VAR NAME="author" --><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_IF --> <!-- TMPL_VAR NAME="publishercode" -->
-				<!-- TMPL_IF name="publicationyear" --><b>in </b><!-- /TMPL_IF --><!-- TMPL_VAR NAME="publicationyear" -->
+				<!-- TMPL_IF name="subtitles" -->
+					<label><b>Subtitle(s):</b> </label>
+					<!-- TMPL_LOOP name="subtitles" -->
+						<!-- TMPL_VAR NAME="subtitle" --> ; 
+					<!-- /TMPL_LOOP -->
+					<br />
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF name="author" --><label><b>Author:</b> </label><!-- TMPL_VAR NAME="author" --><br /><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="additional" --><label><b>Additional Author:</b></label><!-- TMPL_VAR NAME="additional" --><br /><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="publishercode" --><label><b>Published by :</b></label><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="publishercode" --><br />
+				<!-- TMPL_IF name="publicationyear" --><label><b>in </b></label><!-- /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_VAR NAME="isbn" --><br /><!-- /TMPL_IF -->
-				<!-- TMPL_IF name="seriestitle" --><b>Collection:</b> <!-- TMPL_VAR NAME="seriestitle" --><br /><!-- /TMPL_IF -->
-				<!-- TMPL_IF name="subjects" --><b>Subject(s):</b> 
+				<!-- TMPL_IF name="isbn" --><label><b>ISBN:</b> </label><!-- TMPL_VAR NAME="isbn" --><br /><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="seriestitle" --><label><b>Collection:</b> </label><!-- TMPL_VAR NAME="seriestitle" --><br /><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="subjects" --><label><b>Subject(s):</b> </label>
 					<!-- TMPL_LOOP name="subjects" -->
 						<a href="/cgi-bin/koha/opac-search.pl?op=do_search&marclist=bibliosubject.subject&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="subject" escape="HTML"-->"><!-- TMPL_VAR NAME="subject" --></a>, <!-- /TMPL_LOOP -->
 					<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="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>Item type : </b><!-- TMPL_VAR NAME="itemtype" --><br/>
+				<!-- TMPL_IF name="copyrightdate" --><label><b>Year :</b> </label><!-- TMPL_VAR NAME="copyrightdate" --><br /><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="notes" --><label><b>Notes:</b> </label><!-- TMPL_VAR NAME="notes" --><br /><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="unititle" --><label><b>Unititle:</b> </label><!-- TMPL_VAR NAME="unititle" --><br /><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="dewey" --><label><b>Dewey:</b></label><!-- TMPL_VAR name="dewey" --><br /><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="url" --><label><b>URL:</b> </label><a href="<!-- TMPL_VAR name="url" -->"><!-- TMPL_VAR NAME="url" --></a><br /><!-- /TMPL_IF -->
+				<label><b>Item type : </b></label>
+					<!-- TMPL_IF name="description" -->
+						<!-- TMPL_VAR name="description" -->
+					<!-- TMPL_ELSE -->
+						<!-- TMPL_VAR NAME="itemtype" -->
+					<!-- /TMPL_IF -->
+					<br/>
 				<b>Total Number of Items:</b> <!-- TMPL_VAR NAME="count" -->
 			</td>
 		</tr>
@@ -106,13 +118,26 @@
 		</tr>
 		<tr>
 			<th>location</th>
+			<th>status</th>
 			<th>date Due</th>
 			<th>last Seen</th>
 			<th>barcode</th>
 		</tr>
 		<!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
 			<tr>
-				<td><!-- TMPL_VAR NAME="branchname" --> <!-- TMPL_VAR NAME="location" --> <!-- TMPL_IF name="itemcallnumber" -->(<!-- TMPL_VAR NAME="itemcallnumber" -->)<!-- /TMPL_IF --></td>
+				<td>
+					<!-- TMPL_VAR NAME="branchname" --> <!-- TMPL_VAR NAME="location" --> 
+					<!-- TMPL_IF name="itemcallnumber" -->
+						(<!-- TMPL_VAR NAME="itemcallnumber" -->)
+					<!-- /TMPL_IF -->
+				</td>
+				<td>
+					<!-- TMPL_IF name="datedue" -->
+						On loan
+					<!-- TMPL_ELSE -->
+						<!-- TMPL_VAR name="notforloan" -->
+					<!-- /TMPL_IF -->
+				</td>
 				<td><!-- TMPL_VAR NAME="datedue" --></td>
 				<td><!-- TMPL_VAR NAME="datelastseen" --></td>
 				<td><!-- TMPL_VAR NAME="barcode" --></td>
@@ -129,10 +154,10 @@
 			</tr>
 		<!-- /TMPL_LOOP -->
 	</table>
-	<!-- TMPL_IF name="subscriptionid" -->
+	<!-- TMPL_IF name="subscriptionsnumber" -->
 		<p>
-			This is a serial subscription. You can see which 
-				<a href="opac-serial-issues.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->" class="button catalogue" title="Serial issues">
+			This is a serial subscription (we have <!-- TMPL_VAR name="subscriptionsnumber" --> subscriptions). You can see which 
+				<a href="opac-serial-issues.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue" title="Serial issues">
 					Issues
 				</a> we have and don't have
 		</p>
diff --git a/koha-tmpl/opac-tmpl/css/en/opac-main.tmpl b/koha-tmpl/opac-tmpl/css/en/opac-main.tmpl
index 3c30e251c9..34f6c9f9c8 100644
--- a/koha-tmpl/opac-tmpl/css/en/opac-main.tmpl
+++ b/koha-tmpl/opac-tmpl/css/en/opac-main.tmpl
@@ -8,6 +8,7 @@
 	<!-- TMPL_ELSE -->
 		<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang"-->/includes/opac.css" />
 	<!-- /TMPL_IF -->
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
 	<title><!--TMPL_VAR name="LibraryName"--></title>
 </head>
 
diff --git a/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl b/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl
index a8208cdfa4..844dedb9a6 100644
--- a/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl
+++ b/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl
@@ -4,6 +4,7 @@
 <!-- TMPL_IF NAME="message" -->
 	<h2>Impossible to set reserve because </h2>
 	<ul>
+		<!-- TMPL_IF name="noreserve" --><li>You can't make reserve in this library (feature unactivated)</li><!-- /TMPL_IF -->
 		<!-- 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 -->
@@ -68,7 +69,7 @@
 			</li>
 		</ul>
 		<input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->" />
-		<!-- TMPL_IF NAME="fee" -->
+		<!-- TMPL_IF NAME="istherefee" -->
 			<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" />
diff --git a/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl b/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl
index a9d42e1264..ba675f003f 100644
--- a/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl
+++ b/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl
@@ -5,7 +5,7 @@
 
 <form name="f" method="post" action="<!-- TMPL_VAR name="SCRIPT_NAME" -->">
 	
-	<div id="bloc20">
+	<div id="bloc60">
 		<h2 class="catalogue">Search on</h2>
 		<p>
 			<input type="hidden" name="op" value="do_search" />
@@ -40,6 +40,14 @@
 			<input type="hidden" name="operator" value="contains" />  
 			<input type="text" name="value" onchange="sql_update()" size="35" />
 		</p>
+		<p>
+			<label class="label20">Series title</label>
+			<input type="hidden" name="marclist" value="biblio.seriestitle" />
+			<input type="hidden" name="and_or" value="and" />
+			<input type="hidden" name="excluding" value="" />
+			<input type="hidden" name="operator" value="contains" />
+			<input type="text" name="value" onchange="sql_update()" size="35"/>
+		</p>
 		<p>
 			<label class="label20">Item Type</label>
 			<input type="hidden" name="marclist" value="biblioitems.itemtype" />
@@ -56,9 +64,6 @@
 				<input type="hidden" name="operator" value="=" />  
 				<!-- TMPL_VAR name="CGIbranch" -->
 		</p>
-		<p>
-			<input type="submit" value="Start search" class="button catalogue" />
-		</p>
 	</div>
 	<div id="bloc20">
 		<h2>Other options</h2>
@@ -67,7 +72,7 @@
 				<input type="hidden" name="marclist" value="items.barcode" />
 				<input type="hidden" name="and_or" value="and" />
 				<input type="hidden" name="excluding" value="" />
-				<input type="hidden" name="operator" value="contains" />
+				<input type="hidden" name="operator" value="start" />
 				<input type="text" name="value" onchange="sql_update()" /> 
 		</p>
 		<p>
@@ -94,6 +99,20 @@
 			<input type="hidden" name="operator" value="contains" />
 			<input type="text" name="value" onchange="sql_update()" />
 		</p>
+		<p>
+			<label class="label20">Published between</label>
+			<input type="hidden" name="marclist" value="biblioitems.publicationyear" />
+			<input type="hidden" name="and_or" value="and" />
+			<input type="hidden" name="excluding" value="" />
+			<input type="hidden" name="operator" value=">=" />
+			<input type="text" name="value" size="6" maxlength="4" onchange="sql_update()" />
+			and
+			<input type="hidden" name="marclist" value="biblioitems.publicationyear" />
+			<input type="hidden" name="and_or" value="and" />
+			<input type="hidden" name="excluding" value="" />
+			<input type="hidden" name="operator" value="<=" />
+			<input type="text" name="value" size="6" maxlength="4" onchange="sql_update()" />
+		</p>
 		<p>Results per page :
 			<select name="resultsperpage" size="1">
 				<option value="20">20</option>
@@ -111,9 +130,11 @@
 				<option value="biblio.timestamp desc">Acquisition date</option>
 			</select>
 		</p>
-		<p>&nbsp;</p>
-		<p>&nbsp;</p>
 	</div>
+	<p>
+		<input type="submit" value="Start search" class="button catalogue" />
+		<input type="reset" value="Clear all" class="button catalogue" />
+	</p>
 	<div id="bloc60">
 		<h2>Hints</h2>
 		<h3>Title</h3>
diff --git a/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl b/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl
index f15a43a7d3..d21eb50553 100644
--- a/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl
+++ b/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl
@@ -78,16 +78,21 @@
 				</td>
 				<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
 					<!-- TMPL_LOOP name="CN" -->
-						<p><!-- TMPL_VAR name="holdingbranch" --> <!-- TMPL_VAR name="location" --> 
-						<!-- TMPL_IF name="date_due" -->
-							<i>(On Loan until <!-- TMPL_VAR name="date_due" -->)</i>
-						<!-- TMPL_ELSE -->
-							<!-- TMPL_IF name="itemcallnumber" -->
-								(<!-- TMPL_VAR name="itemcallnumber" -->)
+						<p>
+							<!-- TMPL_VAR name="holdingbranch" --> <!-- TMPL_VAR name="location" -->
+							<!-- TMPL_IF name="date_due" -->
+								<i>(On Loan until <!-- TMPL_VAR name="date_due" -->)</i>
+							<!-- TMPL_ELSE -->
+								<!-- TMPL_IF name="itemcallnumber" -->
+									(<!-- TMPL_VAR name="itemcallnumber" -->)
+								<!-- /TMPL_IF -->
+							<!-- /TMPL_IF -->
+							<!-- TMPL_IF name="notforloan" -->
+								<i>(<!-- TMPL_VAR name="notforloan" -->)</i>
 							<!-- /TMPL_IF -->
-						<!-- /TMPL_IF -->
 						</p>
 					<!-- /TMPL_LOOP -->
+					<!-- TMPL_IF name="onorder" --><p>On order</p><!-- /TMPL_IF -->
 				</td>
 				<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
 					<!-- TMPL_UNLESS NAME="norequests" -->
diff --git a/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl b/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl
index 1c08c319ac..a1bc804cb7 100644
--- a/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl
+++ b/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl
@@ -4,7 +4,8 @@
 <h1 class="catalogue">Issues for a subscription</h1>
 <a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">Back to biblio</a>
 <form method="post" name="f">
-<div id="bloc25">
+<!-- TMPL_LOOP name="subscription_LOOP" -->
+<div id="bloc60">
 	<h2 class="catalogue">Subscription information for <!-- TMPL_VAR name="bibliotitle" --></h2>
 		<p>It began on <b><!-- TMPL_VAR name="startdate" --></b> and is issued every
 		<b>
@@ -74,12 +75,14 @@
 		since <b><!-- TMPl_VAR name="startdate" --></b>
 		</p>
 		<p><!-- TMPL_VAR name="notes" --></p>
-	<h2 class="catalogue">Issues summary</h2>
-	<p>
-		<!-- TMPL_VAR name="opacnote" -->
-	</p>
+	<!-- TMPL_IF name="opacnotes" -->
+		<h2 class="catalogue">Issues summary</h2>
+		<p>
+			<!-- TMPL_VAR name="opacnote" -->
+		</p>
+	<!-- /TMPL_IF -->
 </div>
-
+<!-- /TMPL_LOOP -->
 </div>
 
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
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
index 31add9c944e1cf0c1b8fcb84e4b1143c323a13f6..82c90c7827148115f1d503ccd2f4be082eb192b9 100644
GIT binary patch
delta 1540
zcmV+f2K)Jv3y=(dM@dFFIbkCJG63iQ02Cr80y#MvFESo8HyJiLBQ!oCK0zZuLk~$#
zB|=3kK}9D-Ml3=`C`L#zMoKJ6OEXAJG)hiEMMoV}Sru7bF-}n!TVD%dV>wPzG*MJ4
zR$LEbWdUkz9A9HRQdSjWYZPT@7h`NpO;t)xTQ*o=JXT+SR7+etSX)C@RZ>r0Ls?x^
zQD9b3Wkp(FR#Re9Rbxh6U{q9SPg+|^TV?=!feLtjTU2UWR$xhAV@+RPTvuTLfQ4OF
zY))ZdVpVKjS8ZKdX#s?ZQDkFLV{K1mX;@=qXj*bkXmMF&a8+n$42O(nUv*+*Yyggu
zW?*(;WO4w1kCR(zZ*E|CX=8a;ZgOC2cWY&PUT}M1aCUKLgkE%ca%hEYaC38MhG}tl
zZf|&LaD;Sfhi`Csb!&)nZi;Glc64%fcWsJuZ;N(shIep>baZ}oa*l3#dU$qvdUJ_!
zc#L~=i)(&~e07X=dwzR)eRz0{bbF6^d5(R1e|ma<k9&KNb%B9=e35;AhjoFCeSMO5
zgM)E|k9dHSetwgGfQfp6m4ktWdxDmHgO_-RjeUfefrg2Gg_(bbnt+F!dy1TdiHv-U
zoqmmzeT<%gjgEVcnud#xi;0bXjh}yxpn#8|gpiSnkCB9soqUs{hLV$jlb?Z<ppB7~
zf|a3vftZ|=k(Gm&qKKEBgqWj?mzaf_q>PxEft;q6l$eH^rIMGKf}N*>o~V?Wn}naK
znU|Y|psI$UtDBjfh@-8ZoS==QsfnepnxCPHrm&l!qMV_lqMxIlqotswsG_H;q^Yc?
ztF5iFw6n3bwX(Lhv$(Riy1BNyy12ZzyuZDFyT8A^!M?-A!N$qQ#L2_R%E`ye%gN2g
z%+Acp&d$ux%h1!%&eF}&)z8$|(%9P7+T7dN+}+yW*xuma-QnBd<L2Y&<LK+_?&|68
z@b2*K?(_EZ@%8id^6>Wf_VoDl_w)Gm`t$hv`S$zt`TY3$_xt$$_WS<%`}q3&`S<-0
z|NZ;_`~CX<{Qvy_`~Ls@k!m1+00930EC2ui03!f0000R70RIUbNU&f*0Ul&{7+|oW
zLxT<&WuxaWpTB$8=n#0waiD@;^D6T5N3tZj933B)NmsIE$&vNAq%>H}rOlT2ip&(4
zfZENU{`jG5FmpjRph%6)tcDcnJ`^2~H3iC#pD>P*rZ!!-u_2CoTAONrap-MiSfH~S
zjyl_Pn!yb3*djegQ!dba`wS3N0oLwMekuqC^9yuekAV;35&oHv$iPaAfeIP8E%MJ6
z0$W(VneTx>PG&ckj5jcvXqVy!vOC?fnLsM6OYT!8a8m4&Z3GUx?N1*BflP068(7Y!
zx@4FN9WrGtv{qIF<C5fmH*U>~FNp~0L1RNlva^o={u$Uu5}&RVfFx<!^vDsOF<E@9
zsW<hT$C3M7{lK$GQ>as-ctQvpTVx@H8RQ|=$v_JPg-r@*?9oUjpM0`OCW*|^MHpEa
zF&I$vRB+!uOpt*GA&Weci6@?DGKd~$6qv;g3EospLHdAW!W@QwEaHiZny@GdB6Fm%
z#TG1p!x#(&or8-VhBV>{C84C!N-VOx@<}3Wgt3Jb&HSWPLDcxc1|*h<a>^^W+(HW}
zuf*aBj9X0colWduU{Ek?^zq0huh5c9o4efdN-LBA^2Qc6cyrT&2Jx|m9glqSiY>eB
zB1@aEr1A)iQrr-Kl1tk-1i>0?7_!MHve0tHAJ!Fa(#U{kIN^#-^Dya<2yYPbh$pGY
zaz!0aAkqgOY@A`l8u-}62S)%z$l@oh(D4j3OvI1{5G(Y8k8}PI(@_96oVf`pvb1st
zJMMhb%r)|W>(4VY70`#2skDg&HqFZG&pf~Ev;h#6#?t0%EnXmVlQ^A7u#-Rt{Nc$f
zzPwVXB3{6fOf$n=;)NGcT=4KeN=z_FE4=vPOD?<kvP&tbTxy91G>j||6dhF23Z{hK
q@(Cq(%<zHD1=T>p5Q_XK${$FS(18*}H?#u?7Eo{j2s=a_5CA(55BRVE

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

diff --git a/koha-tmpl/opac-tmpl/css/fr/includes/basket.js b/koha-tmpl/opac-tmpl/css/fr/includes/basket.js
index 8184dbe9f3..4126ddd205 100644
--- a/koha-tmpl/opac-tmpl/css/fr/includes/basket.js
+++ b/koha-tmpl/opac-tmpl/css/fr/includes/basket.js
@@ -148,6 +148,9 @@ function addMultiple(){
 			}
 		}
 		addSelRecords(c_value);
+	} else {
+		c_value = c_value + document.myform.bibid.value + "/";
+		addSelRecords(c_value);
 	}
 }
 
@@ -354,4 +357,9 @@ function updateBasket(updated_value,target) {
 document.getElementById == "undefined") {
         target.all['basket'].innerHTML = " ("+updated_value+")";
     }
+}
+
+function openBiblio(biblionumber) {
+	openerURL="opac-detail.pl?bib="+biblionumber;
+	opener.document.location = openerURL;
 }
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/css/fr/includes/opac-basket-menu.inc b/koha-tmpl/opac-tmpl/css/fr/includes/opac-basket-menu.inc
index 93d24559f1..1ffc0d1fbf 100644
--- a/koha-tmpl/opac-tmpl/css/fr/includes/opac-basket-menu.inc
+++ b/koha-tmpl/opac-tmpl/css/fr/includes/opac-basket-menu.inc
@@ -10,4 +10,10 @@
 		<A href='javascript:printBasket()' class="menu">Imprimer</A>
 		<span class="basketspacer">&nbsp;</span>
 		<A href='javascript:quit()' class="menu">Fermer</A>
+		<!-- TMPL_IF NAME="verbose" -->
+			<a href="javascript:showLess()" class="menu">Brief Display</a>
+		<!-- TMPL_ELSE -->
+			<a href="javascript:showMore()" class="menu">More Details</a>
+		<!-- /TMPL_IF -->
+
 	</div>
diff --git a/koha-tmpl/opac-tmpl/css/fr/includes/opac-basket-top.inc b/koha-tmpl/opac-tmpl/css/fr/includes/opac-basket-top.inc
index d8b7733f75..d8d2c263ac 100644
--- a/koha-tmpl/opac-tmpl/css/fr/includes/opac-basket-top.inc
+++ b/koha-tmpl/opac-tmpl/css/fr/includes/opac-basket-top.inc
@@ -4,6 +4,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 	<title>Panier</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
 	<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang">/includes/opac.css">
 	<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/includes/basket.js"></script>
 	<script language="JavaScript" type="text/javascript">
diff --git a/koha-tmpl/opac-tmpl/css/fr/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/css/fr/includes/opac-bottom.inc
index 46c9e78c56..3488c02a5d 100644
--- a/koha-tmpl/opac-tmpl/css/fr/includes/opac-bottom.inc
+++ b/koha-tmpl/opac-tmpl/css/fr/includes/opac-bottom.inc
@@ -2,7 +2,7 @@
 <!-- TMPL_IF NAME="loggedinusername" -->
 	<p>
 		Connecté en tant que <b><!-- TMPL_VAR NAME="loggedinusername" --></b> <a href="/cgi-bin/koha/opac-user.pl">Accueil Membre</a>
-		|| <a href="/cgi-bin/koha/opac-main.pl?logout.x=1">Déconnection</a>
+		|| <a href="/cgi-bin/koha/opac-main.pl?logout.x=1">Déconnexion</a>
 	</p>
 <!-- TMPL_ELSE -->
 	<p>
diff --git a/koha-tmpl/opac-tmpl/css/fr/includes/opac-top.inc b/koha-tmpl/opac-tmpl/css/fr/includes/opac-top.inc
index 16f830d7f1..8f05f68dc3 100644
--- a/koha-tmpl/opac-tmpl/css/fr/includes/opac-top.inc
+++ b/koha-tmpl/opac-tmpl/css/fr/includes/opac-top.inc
@@ -3,8 +3,13 @@
  "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" />
+	<!-- TMPL_IF name="opacstylesheet" -->
+		<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="opacstylesheet"-->" />
+	<!-- TMPL_ELSE -->
+		<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang"-->/includes/opac.css" />
+	<!-- /TMPL_IF -->
 	<title><!--TMPL_VAR name="LibraryName"--></title>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
 	<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/includes/basket.js"></script>
 	<script language="JavaScript" type="text/javascript">
 		function _(s) { return s } // dummy function for gettext
@@ -14,12 +19,12 @@
 	var MSG_BASKET_EMPTY = _("Le panier est vide");
 	var MSG_RECORD_IN_BASKET = _("Cette notice est déjà dans le panier");
 	var MSG_RECORD_ADDED = _("Notice ajoutée au panier");
-	var MSG_NRECORDS_ADDED = _("Notice ajoutée");
+	var MSG_NRECORDS_ADDED = _("Notice(s) ajoutée(s)");
 	var MSG_NRECORDS_IN_BASKET = _("Envoyer le panier");
 	var MSG_NO_RECORD_SELECTED = _("Aucune notice sélectionnée");
 	var MSG_NO_RECORD_ADDED = _("Aucune notice ajoutée");
 	function Dopop(link) {
-		newin=window.open(link,'width=500,height=400,toolbar=false,scrollbars=yes');
+		newin=window.open(link,'popup','width=500,height=400,toolbar=false,scrollbars=yes');
 	}
 	</script>
 </head>
@@ -36,6 +41,6 @@
 		<span class="spacer">&nbsp;</span>
 		<a class="menu" href="/cgi-bin/koha/opac-user.pl" title="Page d'accueil Membre">Vos informations</a>
 		<span class="spacer">&nbsp;</span>
-		<a class="menu" href="javascript:openBasket()" title="Panier de Bibliothèque">Panier de Bibliothèque <span id="basket"><script language="javascript" type="text/javascript">if(basketcount){ document.write(basketcount) };</script></span></a>
+		<a class="menu" href="javascript:openBasket()" title="Panier de notices">Panier de notices <span id="basket"><script language="javascript" type="text/javascript">if(basketcount){ document.write(basketcount) };</script></span></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
index 63c2eeee37..6d4f139231 100644
--- a/koha-tmpl/opac-tmpl/css/fr/includes/opac.css
+++ b/koha-tmpl/opac-tmpl/css/fr/includes/opac.css
@@ -1,6 +1,6 @@
 body {
 	background-color:#009999;
-	font-family:verdana,arial,helvetica;
+	font-family:verdana,arial,helvetica,sans-serif;
 	font-size:12pt;
 	margin:0px;
 	padding:0px
@@ -27,6 +27,7 @@ a:hover {
 	color:#000000;
 }
 
+/* the page result number */
 a.results {
 	background-color : #FFD9BF;
 	padding : 0px 2px 0px 2px;
@@ -39,11 +40,13 @@ a.results:hover {
 	margin : 2px 1px 2px 0px;
 }
 
+/* label size & look just before input fields */
 label {
 	float:left;
 	width: 10em;
 }
 
+/* images */
 img {
 	border-width:0px;
 	text-align:left;
@@ -56,6 +59,7 @@ img {
 	position:relative;
 }
 
+/* main title */
 h1 {
 	color:#FFD9BF;
 	background-color:#FF6600;
@@ -68,6 +72,7 @@ h1 {
 }
 
 /* style for library name, on top of menu (defined in LibraryName systempref) */
+/* in opac-main page */
 .LibraryName {
 	color:#FFD9BF;
 	background-color:transparent;
@@ -79,6 +84,7 @@ h1 {
 	width:75%;
 }
 
+/* in all other pages */
 .SmallLibraryName {
 	color:#FFD9BF;
 	background-color:transparent;
@@ -91,15 +97,17 @@ h1 {
 	margin-left:70px;
 }
 
+/* subtitles. headers of blocks */
 h2 {
 	color:#000000;
-/* 	background-color:#FF6600; */
 	background-image: url(/opac-tmpl/css/en/images/bar.gif);
 	background-repeat:repeat-y;
 	font-weight:bold;
 	font-size: 125%;
 	margin: 0px 0px 10px 0px;
 }
+
+/* probably useless */
 h3 {
 	color:#000000;
 	font-weight:bold;
@@ -107,17 +115,23 @@ h3 {
 	margin: 5px 0px 0px 0px;
 }
 
+/* paragraphs */
 p {
 	padding-left:10pt;
 	padding-bottom:0pt;
 	margin:0pt;
+	clear:left;
 }
+
+/* centered paragraphs */
 p.center {
 	padding-left:10pt;
 	padding-bottom:0pt;
 	margin:0pt;
 	text-align:center;
 }
+
+/* the copyright (at the end of the main page */
 p.copyright {
 	border-top: 1px solid #000000;
 	margin-top:10px;
@@ -191,6 +205,7 @@ td.hilighted {
 	margin : 3px 3px 3px 0px;
 }
 
+/* standard input field */
 input {
 	border:0px;
 	border-bottom:1px solid #000000;
@@ -204,18 +219,19 @@ input:hover {
 	background-color:#FF6600;
 }
 
+/* textarea input field */
 textarea {
 	border:0px;
 	border-bottom:1px solid #000000;
 	background-color:#009999;
 }
-
 textarea:hover {
 	border:0px;
 	border-bottom:1px solid #000000;
 	background-color:#FF6600;
 }
 
+/* select input field */
 select {
 	border:0px;
 	border-bottom:1px solid #000000;
@@ -273,8 +289,8 @@ select:hover {
 
 #leftbloc {
 	float:left;
-	width=30%;
-	border:1;
+	width:30%;
+	border:0;
 }
 
 #bottombloc {
@@ -289,19 +305,17 @@ select:hover {
 /* used in members */
 #bloc20, .bloc20 {
 	float:left;
-	width:30%;
-	border:0;
 	border:1px solid #000000;
 	margin-right:20px;
 	margin-bottom:20px;
+	padding-right:20px;
 }
 #bloc60, .bloc60 {
 	float:left;
-	width:60%;
-	border:0;
 	border:1px solid #000000;
 	margin-right:20px;
 	margin-bottom:20px;
+	padding-right:20px;
 }
 
 /* used in biblio detail */
@@ -329,10 +343,7 @@ select:hover {
 }
 
 #menuline {
-/*	width:100%;
-	vertical-align:top;*/
 	float:left;
-/*	position:relative;*/
 	display:block;
 }
 
@@ -352,4 +363,47 @@ select:hover {
 .basketspacer {
 	padding-left:8pt;
 	float:left;
-}
\ No newline at end of file
+}
+
+/* for MARC view  */
+div.tabs {
+	width:10px;
+	position:absolute;
+	display:block;
+	margin-left:50px;
+	margin-top:150px;
+}
+
+div.tabs a {
+	display:block;
+	font-size: small;
+	border: thin solid black;
+	margin-right: 2px;
+	padding: 10px 10px;
+	-moz-border-radius: 5px 0px 0px 5px;
+}
+
+div.tab {
+	background-color: #ACE6E6;
+	display: block;
+	visibility:hidden;
+	position:absolute;
+	margin-left:72px;
+	margin-top:150px;
+	margin-right:10%;
+}
+
+.MARCtag { /* style for tag definition (700 - Statement of responsability) */
+	font-weight:bold;
+	color:#FF6600;
+	background-color:#FFFFFF;
+	background-image:none;
+	border-bottom: thin solid #FF6600;
+	margin-right:30%;
+}
+
+.labelsubfield { /* style for each subfield (like : a Publication year), just before the biblio subfield */
+	float:left;
+	width: 12em;
+	margin-left:30px;
+}
diff --git a/koha-tmpl/opac-tmpl/css/fr/opac-ISBDdetail.tmpl b/koha-tmpl/opac-tmpl/css/fr/opac-ISBDdetail.tmpl
index 36522ba0bc..78c0398a17 100644
--- a/koha-tmpl/opac-tmpl/css/fr/opac-ISBDdetail.tmpl
+++ b/koha-tmpl/opac-tmpl/css/fr/opac-ISBDdetail.tmpl
@@ -1,16 +1,22 @@
 <!-- TMPL_INCLUDE NAME="opac-top.inc" -->
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/marc-editor.css">
 <div id="bibliomenu">
-	<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue"> Normal </a> <a href="opac-MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button"> MARC </a> <a href="javascript:Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->')" class="button catalogue"> Imprimer </a>
+	<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue"> Simple </a> <a href="opac-MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button"> Complète </a> <a href="opac-ISBDdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue"> ISBD </a> <a href="javascript:Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue"> Ajouter dans l'étagère </a> <a href="javascript:Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->')" class="button catalogue"> Imprimer </a>
 	<!-- TMPL_UNLESS NAME="norequests" -->
 		<a class="button" href="/cgi-bin/koha/opac-reserve.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->">
 			Réserver
 		</a>
 	<!-- /TMPL_UNLESS -->
+	<!-- TMPL_IF name="subscriptionid" -->
+	<a href="opac-serial-issues.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->" class="button catalogue" title="Bulletins">
+		Prêts
+	</a>
+	<!-- /TMPL_IF -->
+	<a class="button" href="javascript:addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->')">Ajouter au panier</a>
 </div>
 
 <div id="mainbloc">
-	<p>ISBD : <!-- TMPL_VAR name="ISBD" --></p>
+	<p><!-- TMPL_VAR name="ISBD" --></p>
 </div>
 </body>
 </html>
diff --git a/koha-tmpl/opac-tmpl/css/fr/opac-MARCdetail.tmpl b/koha-tmpl/opac-tmpl/css/fr/opac-MARCdetail.tmpl
index cd206d8650..c387d627f1 100644
--- a/koha-tmpl/opac-tmpl/css/fr/opac-MARCdetail.tmpl
+++ b/koha-tmpl/opac-tmpl/css/fr/opac-MARCdetail.tmpl
@@ -1,13 +1,17 @@
 <!-- TMPL_INCLUDE NAME="opac-top.inc" -->
-<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/marc-editor.css">
 <div id="bibliomenu">
-	<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue"> Normal </a> <a href="opac-ISBDdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue"> ISBD </a> <a href="javascript:Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->')" class="button catalogue"> Imprimer </a>
-	<!-- TMPL_IF NAME="norequests" -->
-	<!-- TMPL_ELSE -->
+	<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue"> Simple </a> <a href="opac-MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button"> Complète </a> <a href="opac-ISBDdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue"> ISBD </a> <a href="javascript:Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue"> Ajouter dans l'étagère </a> <a href="javascript:Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->')" class="button catalogue"> Imprimer </a>
+	<!-- TMPL_UNLESS NAME="norequests" -->
 		<a class="button" href="/cgi-bin/koha/opac-reserve.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->">
 			Réserver
 		</a>
+	<!-- /TMPL_UNLESS -->
+	<!-- TMPL_IF name="subscriptionid" -->
+	<a href="opac-serial-issues.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->" class="button catalogue" title="Bulletins">
+		Prêts
+	</a>
 	<!-- /TMPL_IF -->
+	<a class="button" href="javascript:addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->')">Ajouter au panier</a>
 </div>
 
 	<div class="tabs">
@@ -215,7 +219,7 @@
 	</div>
 	
 	<div name="10XX" id="10XX" class="tab">
-		<h2 class="catalogue">documents</h2>
+		<h2 class="catalogue">Exemplaires</h2>
 		<table>
 				<tr>
 					<!-- TMPL_LOOP name="item_header_loop" -->
diff --git a/koha-tmpl/opac-tmpl/css/fr/opac-auth.tmpl b/koha-tmpl/opac-tmpl/css/fr/opac-auth.tmpl
index f6533629a5..2de405c976 100644
--- a/koha-tmpl/opac-tmpl/css/fr/opac-auth.tmpl
+++ b/koha-tmpl/opac-tmpl/css/fr/opac-auth.tmpl
@@ -2,7 +2,7 @@
 <div id="mainbloc">
 <!-- TMPL_IF NAME="nopermission" -->
 <!-- This is what is displayed if user doesnt have permission -->
-<h2>Désolé, Koha ne pense pas que vous pouvez accéder à cette page<h2>
+<h2>Désolé, Koha pense que vous ne pouvez pas accéder à cette page.<h2>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="timed_out" -->
@@ -12,12 +12,12 @@
 
 <!-- TMPL_IF NAME="different_ip" -->
 <!-- This is what is displayed if user doesnt have permission -->
-<h2> Vous accédez déjà à Koha à partir d'une autre adresse IP ! Merci de vous reconnecter<h2>
+<h2>Vous accédez déjà à Koha à partir d'une autre adresse IP ! Merci de vous reconnecter<h2>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="invalid_username_or_password" -->
 <!-- This is what is displayed if user doesnt have permission -->
-<h2> Vous avez saisi un nom de membre ou un mot de document invalide, merci de réessayer<h2>
+<h2>Vous avez saisi un nom de membre ou mot de passe invalide, merci de réessayer.<h2>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="loginprompt" -->
@@ -30,7 +30,7 @@
 	<!-- TMPL_LOOP NAME="INPUTS" -->
 		<input type="hidden" name='<!-- TMPL_VAR NAME="name" -->' value='<!-- TMPL_VAR NAME="value" -->' />
 	<!-- /TMPL_LOOP -->
-	<input type="submit" value="S'identifier" class="button">
+	<p><label>&nbsp;</label><input type="submit" value="S'identifier" class="button"></p>
 </form>
 
 <!-- /TMPL_IF -->
diff --git a/koha-tmpl/opac-tmpl/css/fr/opac-basket.tmpl b/koha-tmpl/opac-tmpl/css/fr/opac-basket.tmpl
index 842ce17efa..816a699fdc 100644
--- a/koha-tmpl/opac-tmpl/css/fr/opac-basket.tmpl
+++ b/koha-tmpl/opac-tmpl/css/fr/opac-basket.tmpl
@@ -6,6 +6,113 @@
 <!-- TMPL_INCLUDE NAME="opac-basket-menu.inc" -->
 <!-- /TMPL_IF -->
 <div id="mainbloc" style="margin-top:10px;margin-bottom:20px;padding-top:10px;padding-bottom:10px;">
+<!-- TMPL_IF NAME="verbose" -->
+	<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
+	<h3><!-- TMPL_VAR NAME="title" --><!-- TMPL_IF name="subtitle" --> <!-- TMPL_VAR NAME="subtitle" --><!-- /TMPL_IF --></h3>
+	<table>
+		<!-- TMPL_UNLESS NAME="print_basket" -->
+			<tr><td colspan="2">
+				<form>
+					<label for="bib<!-- TMPL_VAR NAME="biblionumber" -->">
+						<input type="checkbox" value="<!-- TMPL_VAR NAME="biblionumber" -->" name="bib<!-- TMPL_VAR NAME="biblionumber" -->" id="bib<!-- TMPL_VAR NAME="biblionumber" -->" onclick="selRecord(value,checked)"> Sélectionner ce document
+					</label>
+				</form>
+			</td></tr>
+		<!-- /TMPL_UNLESS -->
+		<!-- TMPL_IF name="isbn" -->
+			<tr>
+				<th>ISBN :</th>
+				<td><!-- TMPL_VAR NAME="ISBN" --></td>
+			</tr>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF name="author" -->
+			<tr>
+				<th>Auteur:</th>
+				<td> <!-- TMPL_VAR NAME="author" --></td>
+			</tr>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF name="additional" -->
+			<tr>
+				<th>Autres auteurs :</th>
+				<td><!-- TMPL_VAR NAME="additional" --></td>
+			</tr>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="publishercode" -->
+			<tr>
+				<th>Editeur</th>
+				<td><!-- TMPL_VAR NAME="place" --> <!-- TMPL_VAR NAME="publishercode" --> <!-- TMPL_VAR NAME="publicationyear" --></td>
+			</tr>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="pages" -->
+			<tr>
+				<th>Détails </th>
+				<td><!-- TMPL_VAR NAME="pages" --> <!-- TMPL_VAR NAME="illus" --> <!-- TMPL_VAR NAME="size" --></td>
+			</tr>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF name="collection" -->
+			<tr>
+				<th>Collection :</th>
+				<td> <!-- TMPL_VAR NAME="seriestitle" --></td>
+			</tr>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF name="subject" -->
+			<tr>
+				<th>Mot-clef</th>
+				<td> <!-- TMPL_VAR NAME="subject" --></td>
+			</tr>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF name="copyrightdate" -->
+			<tr>
+				<th>Date copyright</th>
+				<td> <!-- TMPL_VAR NAME="copyrightdate" --></td>
+				</tr>
+			<!-- /TMPL_IF -->
+		<!-- TMPL_IF name="notes" -->
+			<tr>
+				<th>Remarques:</th>
+				<td> <!-- TMPL_VAR NAME="notes" --></td>
+			</tr>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF name="unititle" -->
+			<tr>
+				<th>Titre uniforme : </th>
+				<td> <!-- TMPL_VAR NAME="unititle" --></td>
+			</tr>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF name="serial" -->
+			<tr>
+				<th>Collection</th>
+				<td><!-- TMPL_VAR NAME="serial" --></td>
+			</tr>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF name="dewey" -->
+			<tr>
+				<th>code Dewey :</th>
+				<td><!-- TMPL_VAR name="dewey" --></td>
+			</tr>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF name="classification" -->
+			<tr>
+				<th>Cote du document</th>
+				<td> <!-- TMPL_VAR name="classification" --></td>
+			</tr>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF name="lccn" -->
+			<tr>
+				<th>LCCN</th>
+				<td> <!-- TMPL_VAR name="lccn" --></td>
+			</tr>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF name="url" -->
+			<tr>
+				<th>URL :</th>
+				<td> <!-- TMPL_VAR NAME="url" --></td>
+			</tr>
+		<!-- /TMPL_IF -->
+		</table>
+	<!-- /TMPL_LOOP -->
+<!-- TMPL_ELSE -->
+
 	<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
 	<div width="100%" style="margin-top:0px;margin-bottom:0px;padding-top:10px;padding-bottom:10px;">
 	<table cellspacing="0" style="border:0;width:100%;">
@@ -20,7 +127,7 @@
 				<!-- BIBLIO RECORD TABLE -->
 				<tr>
 					<th>
-						<!-- TMPL_VAR NAME="title" --> (enregistrement <!-- TMPL_VAR NAME="biblionumber" -->)
+						<a onClick="javascript:openBiblio(<!-- TMPL_VAR name="biblionumber" -->)"><!-- TMPL_VAR NAME="title" --></a>
 					</th>
 				</tr>
 				<tr valign="top">
@@ -28,7 +135,7 @@
 						<!-- TMPL_IF name="isbn" --><b>ISBN:</b><!-- TMPL_VAR NAME="ISBN" --><br><!-- /TMPL_IF -->
 						<!-- TMPL_IF name="subtitle" --><b>sous-titre:</b><!-- TMPL_VAR NAME="subtitle" --><br><!-- /TMPL_IF -->
 						<!-- TMPL_IF name="author" --><b>Auteur :</b> <!-- TMPL_VAR NAME="author" --><br><!-- /TMPL_IF -->
-						<!-- TMPL_IF name="additional" --><b>Autres auteurs :</b><!-- TMPL_VAR NAME="additional" --><br><!-- /TMPL_IF -->
+						<!-- TMPL_IF name="additional" --><b>Auteurs secondaires:</b><!-- TMPL_VAR NAME="additional" --><br><!-- /TMPL_IF -->
 						<!-- 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" -->
@@ -38,7 +145,7 @@
 						<!-- TMPL_IF name="copyrightdate" --><b>Tous droits réservés année:</b><!-- TMPL_VAR NAME="copyrightdate" --><br><!-- /TMPL_IF -->
 						<!-- TMPL_IF name="notes" --><b>Remarques:</b> <!-- TMPL_VAR NAME="notes" --><br><!-- /TMPL_IF -->
 						<!-- TMPL_IF name="unititle" --><b>titre uniforme</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="serial" --><b>Colection:</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="classification" --><b>Cote:</b><!-- TMPL_VAR name="classification" --><br><!-- /TMPL_IF -->
 						<!-- TMPL_IF name="lccn" --><b>LCCN:</b> <!-- TMPL_VAR name="lccn" --><br><!-- /TMPL_IF -->
@@ -51,6 +158,7 @@
 	</table>
 	</div>
 	<!-- /TMPL_LOOP -->
+<!-- /TMPL_IF -->
 </div>
 
 <!-- TMPL_UNLESS NAME="print_basket" -->
diff --git a/koha-tmpl/opac-tmpl/css/fr/opac-detail.tmpl b/koha-tmpl/opac-tmpl/css/fr/opac-detail.tmpl
index b00ab4da89..aca03d132f 100644
--- a/koha-tmpl/opac-tmpl/css/fr/opac-detail.tmpl
+++ b/koha-tmpl/opac-tmpl/css/fr/opac-detail.tmpl
@@ -2,7 +2,7 @@
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/marc-editor.css">
 
 <div id="bibliomenu">
-	<a href="opac-ISBDdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue"> ISBD </a> <a href="opac-MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button"> MARC </a> <a href="javascript:Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->')" class="button catalogue"> Imprimer </a>
+	<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue"> Simple </a> <a href="opac-MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button"> Complète </a> <a href="opac-ISBDdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue"> ISBD </a> <a href="javascript:Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue"> Ajouter dans l'étagère </a> <a href="javascript:Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->')" class="button catalogue"> Imprimer </a>
 	<!-- TMPL_UNLESS NAME="norequests" -->
 		<a class="button" href="/cgi-bin/koha/opac-reserve.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->">
 			Réserver
@@ -26,30 +26,42 @@
 		<!-- BIBLIO RECORD TABLE -->
 		<tr>
 			<th>
-				<!-- TMPL_VAR NAME="title" --> (enregistrement <!-- TMPL_VAR NAME="biblionumber" -->)
+				<!-- TMPL_VAR NAME="title" -->
 			</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> <!-- TMPL_VAR NAME="author" --><!-- /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="subtitles" -->
+					<label><b>Sous-titre:</b> </label>
+					<!-- TMPL_LOOP name="subtitles" -->
+						<!-- TMPL_VAR NAME="subtitle" --> ; 
+					<!-- /TMPL_LOOP -->
+					<br />
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF name="author" --><label><b>Auteur:</b> </label><!-- TMPL_VAR NAME="author" --><br /><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="additional" --><label><b>Additional Author:</b></label><!-- TMPL_VAR NAME="additional" --><br /><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="publishercode" --><label><b>Publié par :</b></label><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="publishercode" --><br />
+				<!-- TMPL_IF name="publicationyear" --><label><b>en </b></label><!-- /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="subjects" --><b>Mot-clef :</b><!-- /TMPL_IF --> 
+				<!-- TMPL_IF name="isbn" --><label><b>ISBN :</b> </label><!-- TMPL_VAR NAME="isbn" --><br /><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="seriestitle" --><label><b>Collection :</b> </label><!-- TMPL_VAR NAME="seriestitle" --><br /><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="subjects" --><label><b>Mot-clef :</b> </label>
 					<!-- TMPL_LOOP name="subjects" -->
 						<a href="/cgi-bin/koha/opac-search.pl?op=do_search&marclist=bibliosubject.subject&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="subject" escape="HTML"-->"><!-- TMPL_VAR NAME="subject" --></a>, <!-- /TMPL_LOOP -->
-					<br />
-				<!-- TMPL_IF name="copyrightdate" --><b>Année :</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="copyrightdate" --><br />
-				<!-- TMPL_IF name="notes" --><b>Remarques:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="notes" --><br />
-				<!-- TMPL_IF name="unititle" --><b>Titre uniforme : %s</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="unititle" --><br />
-				<!-- TMPL_IF name="dewey" --><b>code 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>Type de document : </b><!-- TMPL_VAR NAME="itemtype" --><br/>
+					<br /><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="copyrightdate" --><label><b>Year :</b> </label><!-- TMPL_VAR NAME="copyrightdate" --><br /><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="notes" --><label><b>Remarques:</b> </label><!-- TMPL_VAR NAME="notes" --><br /><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="unititle" --><label><b>Unititle:</b> </label><!-- TMPL_VAR NAME="unititle" --><br /><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="dewey" --><label><b>code Dewey :</b></label><!-- TMPL_VAR name="dewey" --><br /><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="url" --><label><b>URL :</b> </label><a href="<!-- TMPL_VAR name="url" -->"><!-- TMPL_VAR NAME="url" --></a><br /><!-- /TMPL_IF -->
+				<label><b>Type de document </b></label>
+					<!-- TMPL_IF name="description" -->
+						<!-- TMPL_VAR name="description" -->
+					<!-- TMPL_ELSE -->
+						<!-- TMPL_VAR NAME="itemtype" -->
+					<!-- /TMPL_IF -->
+					<br/>
 				<b>Nombre Total de documents <!-- TMPL_VAR NAME="count" -->
 			</td>
 		</tr>
@@ -86,13 +98,13 @@
 	<div id="itembloc">
 	<table cellspacing="0">
 		<tr>
-			<th colspan="6">Document</th>
+			<th colspan="6">Exemplaire</th>
 		</tr>
 		<tr>
 			<th>Localisation</th>
 			<th>Date de retour</th>
 			<th>Vu pour la dernière fois</th>
-			<th>code barre</th>
+			<th>code à barres</th>
 		</tr>
 		<!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
 			<tr>
@@ -113,9 +125,9 @@
 			</tr>
 		<!-- /TMPL_LOOP -->
 	</table>
-	<!-- TMPL_IF name="subscriptionid" -->
+	<!-- TMPL_IF name="subscriptionsnumber" -->
 		<p>
-			Il s'agit d'un abonnement. Vous pouvez voir les <a href="opac-serial-issues.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->" class="button catalogue" title="Serial issues">numéros</a> que nous avons et/ou n'avons pas
+			Il s'agit d'un abonnement (nous avons <!-- TMPL_VAR name="subscriptionsnumber" --> abonnements). Vous pouvez voir les <a href="opac-serial-issues.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue" title="Serial issues">numéros</a> que nous avons et/ou n'avons pas
 		</p>
 	<!-- /TMPL_IF -->
 	</div>
diff --git a/koha-tmpl/opac-tmpl/css/fr/opac-detailprint.tmpl b/koha-tmpl/opac-tmpl/css/fr/opac-detailprint.tmpl
index 4ce42ad0db..8d1859879f 100644
--- a/koha-tmpl/opac-tmpl/css/fr/opac-detailprint.tmpl
+++ b/koha-tmpl/opac-tmpl/css/fr/opac-detailprint.tmpl
@@ -4,7 +4,7 @@
 	<table cellspacing="0" cellpadding="1" border="1" width=500>
 	<tr valign="top">
 		<td bgcolor="#cccc99" background="/images/background-mem.gif">
-			<b>Notice numéro <!-- TMPL_VAR NAME="biblionumber" --></b>
+			<b>NOTICE N° <!-- TMPL_VAR NAME="biblionumber" --></b>
 		</td>
 	</tr>
 	<tr valign="top">
diff --git a/koha-tmpl/opac-tmpl/css/fr/opac-main.tmpl b/koha-tmpl/opac-tmpl/css/fr/opac-main.tmpl
index 6a1948ed37..3c3947ff9e 100644
--- a/koha-tmpl/opac-tmpl/css/fr/opac-main.tmpl
+++ b/koha-tmpl/opac-tmpl/css/fr/opac-main.tmpl
@@ -3,13 +3,13 @@
  "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" />
+	<!-- TMPL_IF name="opacstylesheet" -->
+		<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="opacstylesheet"-->" />
+	<!-- TMPL_ELSE -->
+		<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang"-->/includes/opac.css" />
+	<!-- /TMPL_IF -->
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
 	<title><!--TMPL_VAR name="LibraryName"--></title>
-	<style type="text/css">
-	input {
-		background-color: #ACE6E6;
-	}
-	</style>
 </head>
 
 <body>
@@ -19,7 +19,7 @@
 
 <div id="homebloc">
 	<h1 class="LibraryName"><TMPL_VAR name="LibraryName"></h1>
-	<h2>Chercher dans le catalogue</h2>
+	<h2>Chercher</h2>
 	<form action="/cgi-bin/koha/opac-search.pl">
 		<p>
 			<input type="hidden" name="op" value="do_search" />
@@ -28,10 +28,10 @@
 			<input type="hidden" name="and_or" value="and" />
 			<input type="hidden" name="excluding" value="" />
 			<input type="hidden" name="operator" value="contains" />
-			<input type="text" size="27" name="value" tabindex="1" /> <input type="submit" value="OK" class="button" /><br />
+			Recherche simple : <input type="text" size="27" name="value" 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>
+			<a href="/cgi-bin/koha/opac-search.pl" class="button">Recherche Avancée, Plus d'Options	</a>
 		</p>
 	</form>
 
@@ -63,7 +63,7 @@
 			<!-- TMPL_VAR name="textmessaging" -->
 		<!-- /TMPL_IF -->
 	<!-- TMPL_ELSE -->
-		<p><a href="/cgi-bin/koha/opac-user.pl">S'identifier</a> pour avoir des fonctionnalités personnelles</p>
+		<p><a href="/cgi-bin/koha/opac-user.pl">S'identifier</a> pour accéder à votre dossier personnel</p>
 	<!-- /TMPL_IF -->
 	<form action="/cgi-bin/koha/changelanguage.pl" method="post">
 		<select name="language">
@@ -74,7 +74,7 @@
 		<input type="submit" value="Changer la langue" class="button">
 	</form>
 	<p class="copyright">
-		Cette bibliothèque est équipée de <a href="http://www.koha.org">Koha</a>, SIGB sous licence libre, respectueux des standards du web <a href="http://validator.w3.org/check/referer">
+		Cette bibliothèque est équipée de <a href="http://www.koha.org">Koha</a>, SIGB sous licence libre, respectueuse des standards du web <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>
diff --git a/koha-tmpl/opac-tmpl/css/fr/opac-moredetail.tmpl b/koha-tmpl/opac-tmpl/css/fr/opac-moredetail.tmpl
index 00cdb7965b..26b91e1383 100644
--- a/koha-tmpl/opac-tmpl/css/fr/opac-moredetail.tmpl
+++ b/koha-tmpl/opac-tmpl/css/fr/opac-moredetail.tmpl
@@ -23,19 +23,19 @@
 <b>Numé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>Remarques:</b> <!-- TMPL_VAR NAME="loanlength" --><br>
-<b>Auteur :</b> <!-- TMPL_VAR NAME="rentalcharge" --><br>
+<b>Durée du prêt:</b> <!-- TMPL_VAR NAME="loanlength" --><br>
+<b>Frais de location:</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>publié par :</b><!-- TMPL_VAR NAME="publishercode" --> <br>
-<b>Remarques:</b> <!-- TMPL_VAR NAME="place" --><br>
-<b>Remarques:</b> <!-- TMPL_VAR NAME="publicationyear" --><br>
+<b>Editeur:</b> <!-- TMPL_VAR NAME="publishercode" --> <br>
+<b>Emplacement:</b> <!-- TMPL_VAR NAME="place" --><br>
+<b>Date de publication :</b> <!-- TMPL_VAR NAME="publicationyear" --><br>
 <b>Remarques:</b> <!-- TMPL_VAR NAME="volumeddesc" --><br>
-<b>Remarques:</b> <!-- TMPL_VAR NAME="pages" --><br>
-<b>Remarques:</b> <!-- TMPL_VAR NAME="illus" --><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>Remarques:</b> <!-- TMPL_VAR NAME="bnotes" --><br>
-<b>Remarques:</b> <!-- TMPL_VAR NAME="count" -->
+</b> <!-- TMPL_VAR NAME="count" -->'><b>Nbre. d'exemplaires:</b> 
 </td>
 </tr>
 </table>
@@ -45,7 +45,7 @@
 <img src="/images/holder.gif" width=16 height=300 align=left>
 <TABLE>
 <tr>
-<td><b>code barre <!-- TMPL_VAR NAME="barcode" --></b></td>
+<td><b>CODE A BARRES <!-- TMPL_VAR NAME="barcode" --></b></td>
 </tr>
 <tr>
 <td>
@@ -56,21 +56,21 @@
 <input type="image" name="submit" value="modifier" height=42 width=93 border=0 src="/images/modify-mem.gif">
 <input type="image" name="delete" value="Supprimer" height=42 width=93 border=0 src="/images/delete-mem.gif">
 <br>
-<b>Remarques:</b> <!-- TMPL_VAR NAME="homebranch" --><br>
-<b>Remarques:</b> <!-- TMPL_VAR NAME="datelastseen" --><br>
-<b>Auteur :</b> <!-- TMPL_VAR NAME="timestamp0" --><br>
+</b> <!-- TMPL_VAR NAME="homebranch" -->'><b>Site d'origine:</b> <br>
+<b>Vu le :</b> <!-- TMPL_VAR NAME="datelastseen" --><br>
+<b>Dernier emprunteur :</b> <!-- TMPL_VAR NAME="timestamp0" --><br>
 Indicateur de prêt <!-- FIXME - What's this, then? -->
-<b>Auteur :</b> <!-- TMPL_VAR NAME="card0" --><br>
-<b>Auteur :</b> <!-- TMPL_VAR NAME="card1" --><br>
-<b>Auteur :</b> <!-- TMPL_VAR NAME="holdingbranch" --><br>
-<b>Collection:</b> <!-- TMPL_VAR NAME="replacementprice" --><br>
-<b>Type de document : </b><!-- TMPL_VAR NAME="itemlost" --><br>
-<b>Auteur :</b> <!-- TMPL_VAR NAME="paidfor" --><br>
+<b>Dernier emprunteur 1:</b> <!-- TMPL_VAR NAME="card0" --><br>
+<b>Dernier emprunteur 2:</b> <!-- TMPL_VAR NAME="card1" --><br>
+<b>Site actuel :</b> <!-- TMPL_VAR NAME="holdingbranch" --><br>
+<b>Prix de Remplacement :</b> <!-- TMPL_VAR NAME="replacementprice" --><br>
+<b> Document perdu :</b> <!-- TMPL_VAR NAME="itemlost" --><br>
+<b>Payé pour:</b> <!-- TMPL_VAR NAME="paidfor" --><br>
 <b>Remarques:</b> <!-- TMPL_VAR NAME="itemnotes" --><br>
-<b>Remarques:</b> <!-- TMPL_VAR NAME="renewals" --><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">vu le</a>:<!-- TMPL_VAR NAME="dateaccessioned" --><br>
 <b>Annulé <!-- TMPL_VAR NAME="wthdrawn" --><br>
-<b>Remarques:</b> <!-- TMPL_VAR NAME="issues" --><br>
+<b>Total des prêts:</b> <!-- TMPL_VAR NAME="issues" --><br>
 <b>Nombre Total de documents <!-- TMPL_VAR NAME="biblioitemnumber" --> <br>
 <b>Numéro de notice :</b> <!-- TMPL_VAR NAME="biblionumber" --> <br>
 
diff --git a/koha-tmpl/opac-tmpl/css/fr/opac-reserve.tmpl b/koha-tmpl/opac-tmpl/css/fr/opac-reserve.tmpl
index cf73ffd5ff..b7d4f20ca9 100644
--- a/koha-tmpl/opac-tmpl/css/fr/opac-reserve.tmpl
+++ b/koha-tmpl/opac-tmpl/css/fr/opac-reserve.tmpl
@@ -4,6 +4,7 @@
 <!-- TMPL_IF NAME="message" -->
 	<h2>Impossible d'établir la réservation parce que </h2>
 	<ul>
+		<!-- TMPL_IF name="noreserve" --><li>You can't make reserve in this library (feature unactivated)</li><!-- /TMPL_IF -->
 		<!-- 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>vous ne pouvez faire plus de <!-- TMPL_VAR NAME="too_many_reserves" --> réservations</li><!-- /TMPL_IF -->
 		<!-- TMPL_IF NAME="already_reserved" --><li>Vous avez déjà une réservation en cours pour ce document</li><!-- /TMPL_IF -->
@@ -26,7 +27,7 @@
 		<table cellspacing="0">
 			<tr>
 				<th>Réserver</th>
-				<th>Type de documents</th>
+				<th>Type de document</th>
 				<th>Exemplaires</th>
 			</tr>
 			<!-- TMPL_LOOP NAME="TYPES" -->
@@ -41,31 +42,15 @@
 				</tr>
 			<!-- /TMPL_LOOP -->
 		</table>
-		<p> Merci de sélectionner l'annexe où vous souhaitez récupérer le document <!-- TMPL_VAR NAME="CGIbranch" --></p>
-		<p>Réserver à cette date :
-			<select name="required-day">
-<option value="0">Jour</option><option value="1">1</option><option value="2">2</option><option value="3">3</option><option value="4">4</option><option value="5">5</option><option value="6">6</option><option value="7">7</option><option value="8">8</option><option value="9">9</option><option value="10">10</option><option value="11">11</option><option value="12">12</option><option value="13">13</option><option value="14">14</option><option value="15">15</option><option value="16">16</option><option value="17">17</option><option value="18">18</option><option value="19">19</option><option value="20">20</option><option value="21">21</option><option value="22">22</option><option value="23">23</option><option value="24">24</option><option value="25">25</option><option value="26">26</option><option value="27">27</option><option value="28">28</option><option value="29">29</option><option value="30">30</option><option value="31">31</option></select>
-			<select name="required-month">
-<option value="0">Mois</option><option value="1">Janv</option><option value="2">Fév</option><option value="3">Mar</option><option value="4">Avr</option><option value="5">Mai</option><option value="6">Juin</option><option value="7">Juil</option><option value="8">Aoû</option><option value="9">Sept</option><option value="10">Oct</option><option value="11">Nov</option><option value="12">Déc</option></select>
-			<select name="required-year">
-<option value="0">Année</option>
-<option value="2002">2002</option><option value="2003">2003</option><option value="2004">2004</option><option value="2005">2005</option><option value="2006">2006</option></select>
-		</p>
-		<p>Annuler la réservation le :
-			<select name="expires-day">
-<option value="0">Jour</option><option value="1">1</option><option value="2">2</option><option value="3">3</option><option value="4">4</option><option value="5">5</option><option value="6">6</option><option value="7">7</option><option value="8">8</option><option value="9">9</option><option value="10">10</option><option value="11">11</option><option value="12">12</option><option value="13">13</option><option value="14">14</option><option value="15">15</option><option value="16">16</option><option value="17">17</option><option value="18">18</option><option value="19">19</option><option value="20">20</option><option value="21">21</option><option value="22">22</option><option value="23">23</option><option value="24">24</option><option value="25">25</option><option value="26">26</option><option value="27">27</option><option value="28">28</option><option value="29">29</option><option value="30">30</option><option value="31">31</option></select>
-			<select name="expires-month">
-<option value="0">Mois</option><option value="1">Janv</option><option value="2">Fév</option><option value="3">Mar</option><option value="4">Avr</option><option value="5">Mai</option><option value="6">Juin</option><option value="7">Juil</option><option value="8">Aoû</option><option value="9">Sept</option><option value="10">Oct</option><option value="11">Nov</option><option value="12">Déc</option></select>
-			<select name="expires-year">
-<option value="0">Année</option><option value="2002">2002</option><option value="2003">2003</option><option value="2004">2004</option><option value="2005">2005</option><option value="2006">2006</option></select>
-		</p>
+		<p>Merci de sélectionner l'annexe où vous souhaitez récupérer le document <!-- TMPL_VAR NAME="CGIbranch" --></p>
+				
 		<input class="button" type="submit" value="Soumettre">
 	</form>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="item_types_selected" -->
 <!-- if the bibitems have already been selected -->
-	<p> Merci de confirmer que vous souhaitez demander un document de ces types</p>
+	<p>Merci de confirmer que vous souhaitez demander un document de ces types</p>
 
 	<form action="/cgi-bin/koha/opac-reserve.pl" method="post">
 		<input type="hidden" name="place_reserve" value="1" />
@@ -84,7 +69,7 @@
 			</li>
 		</ul>
 		<input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->" />
-		<!-- TMPL_IF NAME="fee" -->
+		<!-- TMPL_IF NAME="istherefee" -->
 			<p>Notez qu'il y aura un coût de <b>$<!-- TMPL_VAR NAME="fee" --></b> pour la réservation</p>
 		<!-- /TMPL_IF -->
 		<input class="button" type="submit" value="Faire une Réservation">
diff --git a/koha-tmpl/opac-tmpl/css/fr/opac-search.tmpl b/koha-tmpl/opac-tmpl/css/fr/opac-search.tmpl
index 937a1ceaf6..88a7a4ef8c 100644
--- a/koha-tmpl/opac-tmpl/css/fr/opac-search.tmpl
+++ b/koha-tmpl/opac-tmpl/css/fr/opac-search.tmpl
@@ -5,7 +5,7 @@
 
 <form name="f" method="post" action="<!-- TMPL_VAR name="SCRIPT_NAME" -->">
 	
-	<div id="bloc20">
+	<div id="bloc60">
 		<h2 class="catalogue">Chercher dans</h2>
 		<p>
 			<input type="hidden" name="op" value="do_search" />
@@ -41,7 +41,15 @@
 			<input type="text" name="value" onchange="sql_update()" size="35" />
 		</p>
 		<p>
-			<label class="label20">Type de documents</label>
+			<label class="label20">Titre périodique/collection</label>
+			<input type="hidden" name="marclist" value="biblio.seriestitle" />
+			<input type="hidden" name="and_or" value="and" />
+			<input type="hidden" name="excluding" value="" />
+			<input type="hidden" name="operator" value="contains" />
+			<input type="text" name="value" onchange="sql_update()" size="35"/>
+		</p>
+		<p>
+			<label class="label20">Type de document</label>
 			<input type="hidden" name="marclist" value="biblioitems.itemtype" />
 			<input type="hidden" name="and_or" value="and" />
 			<input type="hidden" name="excluding" value="" />
@@ -49,25 +57,22 @@
 			<!-- TMPL_VAR name="CGIitemtype" -->
 		</p>
 		<p>
-				<label class="label20">Annexe</label>
+				<label class="label20">Site</label>
 				<input type="hidden" name="marclist" value="items.holdingbranch" />
 				<input type="hidden" name="and_or" value="and" />
 				<input type="hidden" name="excluding" value="" />
 				<input type="hidden" name="operator" value="=" />  
 				<!-- TMPL_VAR name="CGIbranch" -->
 		</p>
-		<p>
-			<input type="submit" value="Lancer la recherche" class="button catalogue">
-		</p>
 	</div>
 	<div id="bloc20">
 		<h2>Autres options</h2>
 		<p>
-				<label class="label20">code barre</label>
+				<label class="label20">Code à barres</label>
 				<input type="hidden" name="marclist" value="items.barcode" />
 				<input type="hidden" name="and_or" value="and" />
 				<input type="hidden" name="excluding" value="" />
-				<input type="hidden" name="operator" value="contains" />
+				<input type="hidden" name="operator" value="start" />
 				<input type="text" name="value" onchange="sql_update()" /> 
 		</p>
 		<p>
@@ -75,7 +80,7 @@
 			<input type="hidden" name="marclist" value="items.itemcallnumber" />
 			<input type="hidden" name="and_or" value="and" />
 			<input type="hidden" name="excluding" value="" />
-			<input type="hidden" name="operator" value="contains" />
+			<input type="hidden" name="operator" value="start" />
 			<input type="text" name="value" onchange="sql_update()" />
 		</p>
 		<p>
@@ -94,6 +99,19 @@
 			<input type="hidden" name="operator" value="contains" />
 			<input type="text" name="value" onchange="sql_update()" />
 		</p>
+		<p>
+			<label class="label20">Publié entre</label>
+			<input type="hidden" name="marclist" value="biblioitems.publicationyear" />
+			<input type="hidden" name="and_or" value="and" />
+			<input type="hidden" name="excluding" value="" />
+			<input type="hidden" name="operator" value=">=" />
+			<input type="text" name="value" size="6" maxlength="4" onchange="sql_update()" /> et
+			<input type="hidden" name="marclist" value="biblioitems.publicationyear" />
+			<input type="hidden" name="and_or" value="and" />
+			<input type="hidden" name="excluding" value="" />
+			<input type="hidden" name="operator" value="<=" />
+			<input type="text" name="value" size="6" maxlength="4" onchange="sql_update()" />
+		</p>
 		<p>Réponses par page
 			<select name="resultsperpage" size="1">
 				<option value="20">20</option>
@@ -111,21 +129,23 @@
 				<option value="biblio.timestamp desc">date d'acquisition</option>
 			</select>
 		</p>
-		<p>&nbsp;</p>
-		<p>&nbsp;</p>
 	</div>
+	<p>
+		<input type="submit" value="Lancer la recherche" class="button catalogue">
+		<input type="reset" value="Effacer Tout" class="button catalogue">
+	</p>
 	<div id="bloc60">
-		<h2>Aide</h2>
+		<h2>Conseils</h2>
 		<h3>Titre</h3>
 		<p>Vous pouvez entrer un titre complet ou partiel. La recherche sera faite aussi sur les sous titre et les autres champs relatifs au titre</p>
 		<h3>Auteur</h3>
 		<p>Vous pouvez entrer un nom ou un prénom. La recherche est aussi faite sur les co-auteurs et les autres champs en relation (traducteur, illustrateur...)</p>
 		<p>N'oubliez pas qu'un auteur peut concerner un auteur physique (Victor Hugo) ou moral (CNRS...)</p>
-		<h3>Annexes</h3>
-		<p>Sélectionnez une annexe si vous voulez limiter votre recherche à une annexe spécifique. Par défaut, la recherche sera faite sur toutes les annexes de la bibliothèque</p>
+		<h3>Sites</h3>
+		<p>Sélectionnez une annexe si vous voulez limiter votre recherche à un site ne particulier. Par défaut, la recherche sera faite sur tous les sites de la bibliothèque</p>
 		<h3>Commencer la recherche</h3>
 		<p>Une recherche est faite sur chaque mot que vous entrez. Les mots vides sont ignorés. Si vous entrez, par exemple "les deux tours" dans le titre, le résultat contiendra tous les mots avec deux ET tours dans le titre. "Les" sera ignoré</p>
-		<p>Si vous voulez entrer une partie de mot, mettez une * ou un % à la fin du mot. Par exemple, "deux tours" retournera "Les deux tours" mais aussi "Une tour et deux maisons"</p>
+		<p>Si vous voulez entrer une partie de mot, mettez une * ou un % à la fin du mot. Par exemple, "deux tours" donnera "Les deux tours" mais aussi "Une tour et deux maisons"</p>
 	</div>
 </form>
 
diff --git a/koha-tmpl/opac-tmpl/css/fr/opac-searchresults.tmpl b/koha-tmpl/opac-tmpl/css/fr/opac-searchresults.tmpl
index db4ff22158..9588f081c1 100644
--- a/koha-tmpl/opac-tmpl/css/fr/opac-searchresults.tmpl
+++ b/koha-tmpl/opac-tmpl/css/fr/opac-searchresults.tmpl
@@ -14,7 +14,7 @@
 	<div id="resultnumber">
 		<p class="center">
 			<!-- TMPL_IF NAME=displayprev -->
-				<a class="results" href="opac-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE="URL" -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;orderby=<!-- TMPL_VAR NAME="orderby" -->&amp;type=intranet&amp;op=do_search"><<Prédécent</a>
+				<a class="results" href="opac-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE="URL" -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;orderby=<!-- TMPL_VAR NAME="orderby" -->&amp;type=intranet&amp;op=do_search">Précédent</a>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_LOOP NAME="numbers" -->
 				<!-- TMPL_IF NAME="highlight" --><!-- TMPL_VAR NAME="number" --><!-- TMPL_ELSE -->
@@ -42,7 +42,7 @@
 	<table>
 		<tr>
 			<th colspan="2">Sommaire</th>
-			<th>Nombre de documents</th>
+			<th>Nombre d'exemplaires</th>
 			<th>Localisation</th>
 			<th>&nbsp;</th>
 		</tr>
@@ -52,7 +52,17 @@
 			<td<!-- TMPL_IF name="even" --> class="hilighted"<!-- /TMPL_IF -->><input type="checkbox" name="bibid" value="<!-- TMPL_VAR NAME="biblionumber" -->"></td>
 				<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
 					<p>
-						<p><b><a class="transparent" href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --></a></b></p>
+						<p>
+							<!-- TMPL_IF name="BiblioDefaultViewmarc" -->
+								<b><a class="transparent" href="/cgi-bin/koha/opac-MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --></a></b>
+							<!-- TMPL_ELSE -->
+								<!-- TMPL_IF name="BiblioDefaultViewisbd" -->
+									<b><a class="transparent" href="/cgi-bin/koha/opac-ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --></a></b>
+								<!-- TMPL_ELSE -->
+									<b><a class="transparent" href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --></a></b>
+								<!-- /TMPL_IF -->
+							<!-- /TMPL_IF -->
+						</p>
 						<p><!-- TMPL_VAR NAME="author" -->
 						<!-- TMPL_IF name="publicationyear" --> - <!-- TMPL_VAR name="publicationyear" --><!-- /TMPL_IF -->
 						<!-- TMPL_IF name="publishercode" -->- <!-- TMPL_VAR name="publishercode" --><!-- /TMPL_IF -->
@@ -89,14 +99,14 @@
 			</tr>
 		<!-- /TMPL_LOOP -->
 		<tr>
-			<th align="left">
+			<th>&nbsp;</th>
+			<th colspan="2" align="left">
 				<!-- TMPL_IF NAME="displayprev" -->
 					<a class="results" href="opac-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE="URL" -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;orderby=<!-- TMPL_VAR NAME="orderby" -->&amp;type=intranet&amp;op=do_search"><<<Précédent</a>
 				<!-- TMPL_ELSE -->
 					&nbsp;
 				<!-- /TMPL_IF -->
 			</th>
-			<th colspan="1">&nbsp;</th>
 			<th colspan="2" align="right">
 				<!-- TMPL_IF NAME="displaynext" -->
 					<a class="results" href="opac-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;orderby=<!-- TMPL_VAR NAME="orderby" -->&amp;type=intranet&amp;op=do_search">Suivant >>></a>
@@ -114,7 +124,7 @@
 	<div id="resultnumber">
 		<p class="center">
 			<!-- TMPL_IF NAME="displayprev" -->
-				<a class="results" href="opac-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE="URL" -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;orderby=<!-- TMPL_VAR NAME="orderby" -->&amp;type=intranet&amp;op=do_search"><<Prédécent</a>
+				<a class="results" href="opac-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE="URL" -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;orderby=<!-- TMPL_VAR NAME="orderby" -->&amp;type=intranet&amp;op=do_search">Précédent</a>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_LOOP NAME="numbers" -->
 				<!-- TMPL_IF NAME="highlight" --><!-- TMPL_VAR NAME="number" --><!-- TMPL_ELSE -->
diff --git a/koha-tmpl/opac-tmpl/css/fr/opac-sendbasket.tmpl b/koha-tmpl/opac-tmpl/css/fr/opac-sendbasket.tmpl
index 1b774ece45..3bf4415ed3 100644
--- a/koha-tmpl/opac-tmpl/css/fr/opac-sendbasket.tmpl
+++ b/koha-tmpl/opac-tmpl/css/fr/opac-sendbasket.tmpl
@@ -1,9 +1,9 @@
 <SUBJECT>
-Panier de Bibliothèque
+Votre panier de notices
 <END_SUBJECT>
 
 <HEADER>
-Bonjour, voici votre panier de notices
+Bonjour, voici le panier de notices transmis par <!-- TMPL_VAR name="email_sender" -->
 <END_HEADER>
 
 <FILENAME>
@@ -12,7 +12,7 @@ basket.txt
 
 <MESSAGE>
 ---------------------------------------------
-<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" --><!-- TMPL_VAR NAME="title" -->(enregistrement <!-- TMPL_VAR NAME="biblionumber" -->)<!-- TMPL_IF name="isbn" -->
+<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" --><!-- TMPL_VAR NAME="title" --> <!-- TMPL_IF name="isbn" -->
 ISBN : <!-- TMPL_VAR NAME="ISBN" --><!-- /TMPL_IF --><!-- TMPL_IF name="subtitle" -->
 Sous-titre: <!-- TMPL_VAR NAME="subtitle" --><!-- /TMPL_IF --><!-- TMPL_IF name="author" -->
 Auteur: <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --><!-- TMPL_IF name="additional" -->
diff --git a/koha-tmpl/opac-tmpl/css/fr/opac-sendbasketform.tmpl b/koha-tmpl/opac-tmpl/css/fr/opac-sendbasketform.tmpl
index fb27c1e979..5f0539b386 100644
--- a/koha-tmpl/opac-tmpl/css/fr/opac-sendbasketform.tmpl
+++ b/koha-tmpl/opac-tmpl/css/fr/opac-sendbasketform.tmpl
@@ -10,13 +10,9 @@
 	<!-- /TMPL_IF -->
 <!-- TMPL_ELSE -->
 <form action="<!-- TMPL_VAR NAME="url" -->" method="post">
-	<TABLE style="border:0;">
-		<TR><TD style="border:0;"><b>adresse e-mail</b></TD>
-		<TD style="border:0;"><input name="email_add" size="25" /></TD></TR>
-		<TR><TD colspan="2" style="border:0;">&nbsp;</TD>
-		<TR><TD style="border:0;"></TD>
-		<TD style="border:0;text-align:right;"><input type="submit" value="Envoyer" class="button"></TD></TR>
-	</TABLE>
+	<p><label>Message envoyé par</label><input name="email_sender" size="25" /></p>
+	<p><label>adresse e-mail</label><input name="email_add" size="25" /></p>
+	<p><label>&nbsp;</label><input type="submit" value="Envoyer" class="button"></p>
 	<input type='hidden' name="bib_list" value="<!-- TMPL_VAR NAME="bib_list" -->" />
 </form>
 <!-- /TMPL_IF -->
diff --git a/koha-tmpl/opac-tmpl/css/fr/opac-serial-issues.tmpl b/koha-tmpl/opac-tmpl/css/fr/opac-serial-issues.tmpl
index 2523a55802..cc4f7c2c56 100644
--- a/koha-tmpl/opac-tmpl/css/fr/opac-serial-issues.tmpl
+++ b/koha-tmpl/opac-tmpl/css/fr/opac-serial-issues.tmpl
@@ -2,11 +2,12 @@
 <!--------------------------MAIN BODY OF PAGE-------------------------->
 <div id="mainbloc">
 <h1 class="catalogue">Bulletins</h1>
-<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">Retour à la bibliothèque</a>
+<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">Retour à la notice</a>
 <form method="post" name="f">
-<div id="bloc25">
-	<h2 class="catalogue">Information de souscription pour <!-- TMPL_VAR name="bibliotitle" --></h2>
-		<p>Débutant le <b><!-- TMPL_VAR name="startdate" --></b> et un numéro chaque<b>
+<!-- TMPL_LOOP name="subscription_LOOP" -->
+<div id="bloc60">
+	<h2 class="catalogue">Information d'abonnement pour<!-- TMPL_VAR name="bibliotitle" --></h2>
+		<p>Débutant le <b><!-- TMPL_VAR name="startdate" --></b> et paraissant chaque<b>
 		<!--TMPL_IF name="periodicity1" -->
 				jour
 		<!-- /TMPL_IF -->
@@ -73,12 +74,14 @@
 		depuis <b><!-- TMPl_VAR name="startdate" --></b>
 		</p>
 		<p><!-- TMPL_VAR name="notes" --></p>
-	<h2 class="catalogue">Bulletins</h2>
-	<p>
-		<!-- TMPL_VAR name="opacnote" -->
-	</p>
+	<!-- TMPL_IF name="opacnotes" -->
+		<h2 class="catalogue">Abrégé des numéros</h2>
+		<p>
+			<!-- TMPL_VAR name="opacnote" -->
+		</p>
+	<!-- /TMPL_IF -->
 </div>
-
+<!-- /TMPL_LOOP -->
 </div>
 
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/css/fr/opac-shelves.tmpl b/koha-tmpl/opac-tmpl/css/fr/opac-shelves.tmpl
index a743247260..63664c8cb3 100644
--- a/koha-tmpl/opac-tmpl/css/fr/opac-shelves.tmpl
+++ b/koha-tmpl/opac-tmpl/css/fr/opac-shelves.tmpl
@@ -1,160 +1,188 @@
 <!-- TMPL_INCLUDE Name="opac-top.inc" -->
 <div id="mainbloc">
 <!-- TMPL_IF Name="viewshelf" -->
-<form>
-    <table>
-    		<tr>
-			<th colspan=4>
-				Contenu de <!-- TMPL_VAR Name="shelfname" -->
-			</th>
-		</tr>
-		<!-- TMPL_LOOP Name="itemsloop" -->
-			<tr>
-				<!-- TMPL_IF name="color" -->
-					<td class="hilighted"><input type=checkbox name="REM-<!-- TMPL_VAR Name="itemnumber" -->"></td>
-					<td class="hilighted"><a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR Name="barcode" --></a></td>
-					<td class="hilighted"><!-- TMPL_VAR Name="title" --></td>
-					<td class="hilighted"><!-- TMPL_VAR Name="author" --></td>
-				<!-- TMPL_ELSE -->
-					<td><input type=checkbox name="REM-<!-- TMPL_VAR Name="itemnumber" -->"></td>
-					<td class="hilighted"><a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR Name="barcode" --></a></td>
-					<td><!-- TMPL_VAR Name="title" --></td>
-					<td><!-- TMPL_VAR Name="author" --></td>
-				<!-- /TMPL_IF -->
-			</tr>
-		<!-- /TMPL_LOOP -->
-	</table>
-	<br>
-	<a href="opac-shelves.pl" class="button">Liste de l'étagère virtuelle</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" -->">
+	<form>
+		<h1><!-- TMPL_VAR NAME="shelfname" --></h1>
+
+		<div>
+		<h2>Contenu de l'étagère virtuelle</h2>
+			<table class="small">
+				<tr colspan="4">
+					<th>Supprimer</th>
+					<th>code à barres</th>
+					<th>Titre</th>
+					<th>Auteur</th>
+				</tr>
+				<!-- TMPL_LOOP Name="itemsloop" -->
+					<tr>
+						<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->><input type="checkbox" name="REM-<!-- TMPL_VAR NAME="itemnumber" -->"></td>
+						<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="barcode" --></td>
+						<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->><a class="transparent" href="opac-MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a></td>
+						<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="author" --></td>
+					</tr>
+				<!-- /TMPL_LOOP -->
+			</table>
+			<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" -->">
+			<!-- TMPL_IF name="manageshelf" -->
+				<input type="submit" value="Supprimer les documents sélectionnés" class="button">
+			<!-- /TMPL_IF -->
+			<a href="opac-shelves.pl" class="button">Liste de l'étagère virtuelle</a>
+		</div>
+	</form>
+
 	<!-- TMPL_IF name="manageshelf" -->
-		<input type=submit value="Supprimer les documents sélectionnés" class="button">
+	<div class="bloc20">
+		<form>
+		<h2>Ajouter un livre par saisie du code barre</h2>
+			<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 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">
+		</form>
+	</div>
 	<!-- /TMPL_IF -->
-</form>
-<!-- TMPL_IF name="manageshelf" -->
-<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 saisie du 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_IF -->
 <!-- TMPL_ELSE -->
 	<!-- TMPL_IF Name="shelves" -->
+		<h1>Etagères</h1>
 		<!-- TMPL_IF Name="status1" -->
-			<font color=red><!-- TMPL_VAR Name="string1" --></font><p>
+			<p class="problem"><!-- TMPL_VAR NAME="string1" --><p>
 		<!-- /TMPL_IF -->
 		<!-- TMPL_LOOP Name="paramsloop" -->
 			<!-- TMPL_IF Name="status" -->
-				<font color=red><!-- TMPL_VAR Name="string" --></font><p>
+				<p class="problem"><!-- TMPL_VAR NAME="string" --><p>
 			<!-- /TMPL_IF -->
 		<!-- /TMPL_LOOP -->
-		<center>
-		<h1>Rayons</h1>
-		<table border=0 cellpadding=7>
-			<tr>
-				<td align=center valign="bottom">
-					<form>
-						<p>
-							<a href="opac-shelves.pl" class="button">Liste de l'étagère virtuelle</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>Sélectionner les étagères virtuelles à supprimer
-							</th>
-						</tr>
+		<div class="bloc20">
+					<h2>Sélectionner les étagères virtuelles à supprimer</h2>
+					<form method="post">
+					<input type="hidden" name="shelves" value="1">
 						<!-- TMPL_LOOP Name="shelvesloop" -->
 						<!-- TMPL_IF name="canmanage" -->
-						<tr>
-							<td bgcolor="<!-- TMPL_VAR Name="color" -->">
-								<input type=checkbox name="DEL-<!-- TMPL_VAR Name="shelf" -->">
-								<!-- TMPL_VAR Name="shelfname" --> (<!-- TMPL_VAR Name="shelfbookcount" --> livres)
-							</td>
-						</tr>
+						<p>
+							<label>
+								<input type="checkbox" name="DEL-<!-- TMPL_VAR NAME="shelf" -->">
+							</label>
+								<a href="opac-shelves.pl?viewshelf=<!-- TMPL_VAR name="shelf" -->"><!-- TMPL_VAR NAME="shelfname" --></a> (<!-- TMPL_VAR NAME="shelfbookcount" --> document(s))
+						</p>
 						<!-- /TMPL_IF -->
 						<!-- /TMPL_LOOP -->
-					</table>
 					<p>
-						<input type=submit value="Supprimer étagères" class="button"></form>
+						<input type="submit" value="Supprimer étagères" class="button">
 					</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>
-								<font color=white>Créer une étagère</font>
-							</th>
-						</tr>
-						<tr>
-							<td>
-								<p>Nom : <input type="text" name="addshelf" size="25"></p>
-								<p>Propriétaire <input type="hidden" name="owner" value="<!-- TMPL_VAR name="loggedinuser" -->"><!-- TMPL_VAR name="loggedinusername" --></p>
-								<p>Catégorie <select name="category">
-									<option value="1">Privé</option>
-									<option value="2">Public</option>
-									<option value="3">Libre</option>
-									</select>
-								</p>
-								<p> <li> Une étagère virtuelle privée est gérée par vous seul, et ne peut être vue que de vous.</li>
-									<li> public peut être vu par tous, mais géré uniquement par vous</li>
-									<li> libre peut être géré par n'importe quel utilisateur</li>
-								</p>
-							</td>
-						</tr>
-					</table>
-								<p><input type=submit value="Créer une étagère" class="button"></p>
 					</form>
-				</td>
-			</tr>
-		</table>
+		</div>
+		<div id="bloc60">
+			<form method="post">
+				<input type="hidden" name="shelves" value="1">
+				<h2>Créer une étagère</h2>
+				<p><label>Nom</label><input type="text" name="addshelf" size="25"></p>
+				<p><label>Propriétaire</label><input type="hidden" name="owner" value="<!-- TMPL_VAR NAME="loggedinuser" -->"><!-- TMPL_VAR NAME="loggedinusername" --></p>
+				<p><label>Catégorie</label>
+					<select name="category">
+						<option value="1">Privé</option>
+						<option value="2">Public</option>
+						<option value="3">Libre</option>
+					</select>
+				</p>
+				<ul> <li>Une étagère virtuelle privée est gérée par vous seul, et ne peut être vue que de vous.</li>
+					<li> public peut être vu par tous, mais géré uniquement par vous</li>
+					<li> libre peut être géré par n'importe quel utilisateur</li>
+				</ul>
+				<p>
+					<input type="submit" value="Créer une étagère" class="button">
+					<a href="opac-shelves.pl" class="button">Retour à l'étagère virtuelle</a>
+				</p>
 
+			</form>
+		</div>
 	<!-- TMPL_ELSE -->
-		<center>
-		<table border=0 cellpadding=4 cellspacing=0>
-			<tr>
-				<th>
-				Liste de l'étagère virtuelle
-				</th>
-			</tr>
-			<!-- TMPL_LOOP Name="shelvesloop" -->
-			<tr>
-				<!-- TMPL_IF name="color" -->
-					<td class="hilighted">
-				<!-- TMPL_ELSE -->
-					<td>
-				<!-- /TMPL_IF -->
-					<a href="opac-shelves.pl?viewshelf=<!-- TMPL_VAR Name="shelf" -->">
-						<!-- TMPL_VAR Name="shelfname" -->(<!-- TMPL_VAR Name="shelfbookcount" --> livres)
-					</a>
-				</td>
-			</tr>
-			<!-- /TMPL_LOOP -->
-		</table>
-		<P>
+		<div class="bloc60">
+			<h2>Liste de l'étagère virtuelle</h2>
+			<table class="small">
+				<tr>
+					<th>Nom de l'étagère virtuelle</th>
+					<th>Catégorie</th>
+					<th>Contenu taille</th>
+					<th>modifier</th>
+				</tr>
+				<!-- TMPL_LOOP Name="shelvesloop" -->
+				<tr>
+					<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->>
+						<a class="transparent" href="opac-shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelf" -->">
+							<!-- TMPL_VAR NAME="shelfname" -->
+						</a>
+					</td>
+					<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->>
+						<!-- TMPL_IF NAME="category1" -->
+							Privé
+						<!-- /TMPL_IF -->
+						<!-- TMPL_IF NAME="category2" -->
+							Public
+						<!-- /TMPL_IF -->
+						<!-- TMPL_IF NAME="category3" -->
+							Libre
+						<!-- /TMPL_IF -->
+					</td>
+					<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->>
+						<!-- TMPL_VAR NAME="shelfbookcount" --> documents(s)
+					</td>
+					<!-- TMPL_IF name="mine" -->
+						<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->>
+							<a href="opac-shelves.pl?op=modif&shelf=<!-- TMPL_VAR NAME="shelf" -->" class="button">Modifier</a> <!-- TMPL_VAR name="surname" --><!-- TMPL_VAR name="firstname" -->
+						</td>
+					<!-- /TMPL_IF -->
+				</tr>
+				<!-- /TMPL_LOOP -->
+			</table>
+		</div>
+		<div class="bloc20">
 			<a href="opac-shelves.pl?shelves=1" class="button">Créer ou Supprimer une (des) étagère(s)</a>
-		</p>
+		</div>
 	<!-- /TMPL_IF -->
 <!-- /TMPL_IF -->
+
+<!-- TMPL_IF name="edit" -->
+	<div class="bloc20">
+		<form method="post">
+			<input type="hidden" name="op" value="modifsave">
+			<h2>Modifier l'étagère</h2>
+			<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR name="shelfnumber" -->">
+			<p><label>Nom</label><input type="text" name="shelfname" size="25" value="<!-- TMPL_VAR name="shelfname"-->"></p>
+			<p><label>Propriétaire</label><input type="hidden" name="owner" value="<!-- TMPL_VAR NAME="loggedinuser" -->"><!-- TMPL_VAR NAME="loggedinusername" --></p>
+			<p><label>Catégorie</label>
+				<select name="category">
+					<!-- TMPL_IF name="category1" -->
+						<option value="1" selected>Privé</option>
+					<!-- TMPL_ELSE -->
+						<option value="1">Privé</option>
+					<!-- /TMPL_IF -->
+					<!-- TMPL_IF name="category2" -->
+						<option value="2" selected>Public</option>
+					<!-- TMPL_ELSE -->
+						<option value="2">Public</option>
+					<!-- /TMPL_IF -->
+					<!-- TMPL_IF name="category3" -->
+						<option value="3" selected>Libre</option>
+					<!-- TMPL_ELSE -->
+						<option value="3">Libre</option>
+					<!-- /TMPL_IF -->
+				</select>
+			</p>
+			<p> <li>Une étagère virtuelle privée est gérée par vous seul, et ne peut être vue que de vous.</li>
+				<li> public peut être vu par tous, mais géré uniquement par vous</li>
+				<li> libre peut être géré par n'importe quel utilisateur</li>
+			</p>
+			<p>
+				<input type="submit" value="Enregistrer" class="button">
+			</p>
+
+		</form>
+	</div>
+<!-- /TMPL_IF -->
 </div>
 <!-- TMPL_INCLUDE Name="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/css/fr/opac-suggestions.tmpl b/koha-tmpl/opac-tmpl/css/fr/opac-suggestions.tmpl
index 095ddc240a..df5ef0ed2b 100644
--- a/koha-tmpl/opac-tmpl/css/fr/opac-suggestions.tmpl
+++ b/koha-tmpl/opac-tmpl/css/fr/opac-suggestions.tmpl
@@ -11,7 +11,7 @@
 		<p><label>Date copyright</label><input type="text" name="copyrightdate" size="5" maxlength="4"></p>
 		<p><label>Editeur</label><input type="text" name="publishercode" size="60" maxlength="80"></p>
 		<p><label>Volume</label><input type="text" name="volumedesc" size="60" maxlength="80"></p>
-		<p><label>année de Publication</label><input type="text" name="publicationyear" size="5" maxlength="4"></p>
+		<p><label>Année de Publication</label><input type="text" name="publicationyear" size="5" maxlength="4"></p>
 		<p><label>Lieu de Publication</label><input type="text" name="place" size="60" maxlength="80"></p>
 		<p><label>ISBN/ISSN</label><input type="text" name="isbn" size="14" maxlength="10"></p>
 		<p><label>Remarque</label><textarea name="note" rows="10" cols="60"></textarea></p>
@@ -20,7 +20,7 @@
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF name="op_else" -->
-	<h1>Suggestions</h1>
+	<h1>Suggestions d'achat</h1>
 	<table>
 		<tr>
 			<th>&nbsp;</th>
@@ -36,7 +36,7 @@
 		<tr>
 			<form>
 				<th>
-					Filter sur
+					Filtrer sur
 				</th>
 				<th>
 					<input type="text" name="title" value="<!-- TMPL_VAR name="title"-->">
@@ -99,7 +99,7 @@
 		<!-- TMPL_LOOP NAME="suggestions_loop" -->
 			<tr>
 				<td>
-					<input type="checkbox" name="delete_field" value="<!--TMPL_VAR name="suggestionnumber" -->">
+					<input type="checkbox" name="delete_field" value="<!--TMPL_VAR name="suggestionid" -->">
 				</td>
 				<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
 					<!-- TMPL_VAR NAME="title" -->
@@ -118,7 +118,7 @@
 					<!-- TMPL_IF name="ACCEPTED" -->Accepté, sera commandé rapidement<!-- /TMPL_IF -->
 					<!-- TMPL_IF name="ORDERED" -->Commandé par la bibliothèque<!-- /TMPL_IF -->
 					<!-- TMPL_IF name="REJECTED" -->Suggestion rejetée : ne sera pas acheté<!-- /TMPL_IF -->
-					<!-- TMPL_IF name="AVAILABLE" -->Commandé par la bibliothèque<!-- /TMPL_IF -->
+					<!-- TMPL_IF name="AVAILABLE" -->Reçu par la bibliothèque<!-- /TMPL_IF -->
 				</td>
 				<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
 					<!-- TMPL_VAR name="surnamesuggestedby" --><!-- TMPL_IF name="firstnamesuggestedby" -->,<!-- /TMPL_IF --> <!-- TMPL_VAR name="firstnamesuggestedby" -->
diff --git a/koha-tmpl/opac-tmpl/css/fr/opac-user.tmpl b/koha-tmpl/opac-tmpl/css/fr/opac-user.tmpl
index ee8c611ea8..0e469c3d71 100644
--- a/koha-tmpl/opac-tmpl/css/fr/opac-user.tmpl
+++ b/koha-tmpl/opac-tmpl/css/fr/opac-user.tmpl
@@ -6,7 +6,7 @@
 		<p>Identifiant <!-- 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" --> (maison)</p>
+		<p><!-- TMPL_VAR NAME="phone" -->(domicile)</p>
 		<p><!-- TMPL_VAR NAME="faxnumber" --> (travail)</p>
 		<p><!-- TMPL_VAR NAME="emailaddress" --></p>
 		<p><a href="/cgi-bin/koha/opac-userupdate.pl" class="button">Mettre à jour</a></p>
@@ -54,7 +54,7 @@
 				<th>Auteur</th>
 				<th>Date de retour</th>
 				<th>Type de document</th>
-				<th>code barre</th>
+				<th>Code à barres</th>
 				<th>Payant</th>
 				<th>Renouvelable</th>
 			</tr>
diff --git a/koha-tmpl/opac-tmpl/css/fr/opac-userupdate.tmpl b/koha-tmpl/opac-tmpl/css/fr/opac-userupdate.tmpl
index fa8673a41f..e73585d0f4 100644
--- a/koha-tmpl/opac-tmpl/css/fr/opac-userupdate.tmpl
+++ b/koha-tmpl/opac-tmpl/css/fr/opac-userupdate.tmpl
@@ -2,8 +2,8 @@
 
 <div id="mainbloc">
 <h2>Modifier vos informations</h2>
-<p><i> Merci de changer ce qui doit l'être. Un message sera envoyé à  la bibliothèque.<br />
- Vos modifications n'apparaîtront pas avant la validation de la bibliothèque</i></p>
+<p><i>Merci de changer ce qui doit l'être. Un message sera envoyé à  la bibliothèque.<br />
+Vos modifications n'apparaîtront pas avant la validation de la bibliothèque</i></p>
 
 <!-- TMPL_LOOP name="BORROWER_INFO" -->
 <form action="/cgi-bin/koha/opac-userupdate.pl" method="get">
diff --git a/koha-tmpl/opac-tmpl/npl/en/opac-auth.tmpl b/koha-tmpl/opac-tmpl/npl/en/opac-auth.tmpl
index b216688219..87d332a3a9 100644
--- a/koha-tmpl/opac-tmpl/npl/en/opac-auth.tmpl
+++ b/koha-tmpl/opac-tmpl/npl/en/opac-auth.tmpl
@@ -34,7 +34,7 @@
 <!-- /TMPL_LOOP -->
 <div class="form">
 <table>
-<tr><th><label for="userid">Your card number</label></th><td><input type="text"  size="25" id="userid"  name="userid" onblur="ValidateCode();"></td>
+<tr><th><label for="userid">Your card number</label></th><td><input type="text"  size="25" id="userid"  name="userid"></td>
 <tr><th><label for="password">Password or PIN</label></th><td><input type="password"  size="25" id="password"  name="password"></td>
 </table>
 <input type="submit" value="Log In" class="submit"></div>
diff --git a/koha-tmpl/opac-tmpl/npl/en/opac-main.tmpl b/koha-tmpl/opac-tmpl/npl/en/opac-main.tmpl
index 50921cc7bc..c7cf71d776 100644
--- a/koha-tmpl/opac-tmpl/npl/en/opac-main.tmpl
+++ b/koha-tmpl/opac-tmpl/npl/en/opac-main.tmpl
@@ -11,7 +11,7 @@
 <!-- TMPL_ELSE --><div id="sidebar">
 <form action="/cgi-bin/koha/opac-user.pl" method="post" name="auth" id="auth">
 <h3>Log in to Check Your Account</h3>
-<p><label for="userid">Card Number:</label> <input type="text" id="userid" size="10" name="userid" onblur="ValidateCode();" /></p>
+<p><label for="userid">Card Number:</label> <input type="text" id="userid" size="10" name="userid" /></p>
 <p><label for="password">Password:</label> <input type="password" id="password" size="10" name="password" /></p>
 <p><input type="submit" value="Log In" class="submit" /></p>
 </form></div>
@@ -62,7 +62,7 @@
 <!-- /TMPL_LOOP --></p>
 <p><a href="/cgi-bin/koha/opac-user.pl">your library home</a> |   
 	<a href="/cgi-bin/koha/opac-account.pl">your account</a> |
-	<a href="/cgi-bin/koha/opac-userdetails.pl">your personal details</a>		<!-- TMPL_IF name="virtualshelves" -->| <a href="/cgi-bin/koha/opac-shelves.pl" class="button">virtual shelves</a><!-- /TMPL_IF --><!-- TMPL_IF name="suggestion" -->| <a href="opac-suggestions.pl" class="button">view &amp; manage suggestions</a><!-- /TMPL_IF --></p>
+	<a href="/cgi-bin/koha/opac-userdetails.pl">your personal details</a>		<!-- TMPL_IF name="virtualshelves" -->| <a href="/cgi-bin/koha/opac-shelves.pl" class="button">virtual shelves</a><!-- /TMPL_IF --><!-- TMPL_IF name="suggestion" -->| <a href="/cgi-bin/koha/opac-suggestions.pl">view &amp; manage suggestions</a><!-- /TMPL_IF --></p>
 		<!-- TMPL_IF name="textmessaging"-->
 			<h2>Message from the library</h2>
 			<p><!-- TMPL_VAR name="textmessaging" --></p>
diff --git a/koha-tmpl/opac-tmpl/npl/en/opac-serial-issues.tmpl b/koha-tmpl/opac-tmpl/npl/en/opac-serial-issues.tmpl
index 6d1a548b67..a1bc804cb7 100644
--- a/koha-tmpl/opac-tmpl/npl/en/opac-serial-issues.tmpl
+++ b/koha-tmpl/opac-tmpl/npl/en/opac-serial-issues.tmpl
@@ -1,24 +1,88 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Subscription Details
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!--TMPL_INCLUDE NAME="masthead.inc" -->
-<!--TMPL_INCLUDE NAME="navigation.inc" -->
-
-<div id="main">
-
-<h1>Subscription Details</h1>
-<div class="table details">
+<!-- TMPL_INCLUDE NAME="opac-top.inc" -->
+<!--------------------------MAIN BODY OF PAGE-------------------------->
+<div id="mainbloc">
+<h1 class="catalogue">Issues for a subscription</h1>
+<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">Back to biblio</a>
+<form method="post" name="f">
 <!-- TMPL_LOOP name="subscription_LOOP" -->
-	<table>
-	<caption><em><!-- TMPL_VAR name="bibliotitle" --></em></caption>
-	<tr><th>Details:</th><td><p>It began on <b><!-- TMPL_VAR name="startdate" --></b> and is issued every <b> <!--TMPL_IF name="periodicity1" --> day <!-- /TMPL_IF --> <!--TMPL_IF name="periodicity2" --> week <!-- /TMPL_IF --> <!--TMPL_IF name="periodicity3" --> 2 weeks <!-- /TMPL_IF --> <!--TMPL_IF name="periodicity4" --> 3 weeks <!-- /TMPL_IF --> <!--TMPL_IF name="periodicity5" --> month <!-- /TMPL_IF --> <!--TMPL_IF name="periodicity6" --> 2 months <!-- /TMPL_IF --> <!--TMPL_IF name="periodicity7" --> 3 months <!-- /TMPL_IF --> <!--TMPL_IF name="periodicity8" --> quarter <!-- /TMPL_IF --> <!--TMPL_IF name="periodicity9" --> 2 quarters <!-- /TMPL_IF --> <!--TMPL_IF name="periodicity10" --> year <!-- /TMPL_IF --> <!--TMPL_IF name="periodicity11" --> 2 years <!-- /TMPL_IF --> </b> on <b> <!--TMPL_IF name="arrival1" --> 	Monday <!-- /TMPL_IF --> <!--TMPL_IF name="arrival2" --> Tuesday <!-- /TMPL_IF --> <!--TMPL_IF name="arrival3" --> Wednesday <!-- /TMPL_IF --> <!--TMPL_IF name="arrival4" --> Thursday <!-- /TMPL_IF --> <!--TMPL_IF name="arrival5" --> Friday <!-- /TMPL_IF --> <!--TMPL_IF name="arrival6" --> Saturday <!-- /TMPL_IF --> <!--TMPL_IF name="arrival7" --> Sunday <!-- /TMPL_IF --> </b> for <b> 	<!-- TMPL_IF name="numberlength" --><!-- TMPL_VAR name="numberlength" --> issues<!-- /TMPL_IF --> 	<!-- TMPL_IF name="weeklength" --><!-- TMPL_VAR name="weeklength" --> weeks<!-- /TMPL_IF --> 	<!-- TMPL_IF name="monthlength" --><!-- TMPL_VAR name="monthlength" --> months<!-- /TMPL_IF --> 	</b> since <b><!-- TMPL_VAR name="startdate" --></b> </p></td></tr>
-<!-- TMPL_IF name="notes" --><tr><th>Notes: </th><td><!-- TMPL_VAR name="notes" --></td></tr><!-- /TMPL_IF -->
-<!-- TMPL_IF name="opacnotes" --><tr><th>Issues summary</th><td><!-- TMPL_VAR name="opacnote" --></td></tr><!-- /TMPL_IF -->
-	</table><!-- /TMPL_LOOP -->
+<div id="bloc60">
+	<h2 class="catalogue">Subscription information for <!-- TMPL_VAR name="bibliotitle" --></h2>
+		<p>It began on <b><!-- TMPL_VAR name="startdate" --></b> and is issued every
+		<b>
+		<!--TMPL_IF name="periodicity1" -->
+				day
+		<!-- /TMPL_IF -->
+		<!--TMPL_IF name="periodicity2" -->
+				week
+		<!-- /TMPL_IF -->
+		<!--TMPL_IF name="periodicity3" -->
+				2 weeks
+		<!-- /TMPL_IF -->
+		<!--TMPL_IF name="periodicity4" -->
+				3 weeks
+		<!-- /TMPL_IF -->
+		<!--TMPL_IF name="periodicity5" -->
+				month
+		<!-- /TMPL_IF -->
+		<!--TMPL_IF name="periodicity6" -->
+				2 months
+		<!-- /TMPL_IF -->
+		<!--TMPL_IF name="periodicity7" -->
+				3 months
+		<!-- /TMPL_IF -->
+		<!--TMPL_IF name="periodicity8" -->
+				quarter
+		<!-- /TMPL_IF -->
+		<!--TMPL_IF name="periodicity9" -->
+				2 quarters
+		<!-- /TMPL_IF -->
+		<!--TMPL_IF name="periodicity10" -->
+				year
+		<!-- /TMPL_IF -->
+		<!--TMPL_IF name="periodicity11" -->
+				2 years
+		<!-- /TMPL_IF -->
+		</b>
+		on
+		<b>
+		<!--TMPL_IF name="arrival1" -->
+			Monday
+		<!-- /TMPL_IF -->
+		<!--TMPL_IF name="arrival2" -->
+				Tuesday
+		<!-- /TMPL_IF -->
+		<!--TMPL_IF name="arrival3" -->
+				Wednesday
+		<!-- /TMPL_IF -->
+		<!--TMPL_IF name="arrival4" -->
+				Thursday
+		<!-- /TMPL_IF -->
+		<!--TMPL_IF name="arrival5" -->
+				Friday
+		<!-- /TMPL_IF -->
+		<!--TMPL_IF name="arrival6" -->
+				Saturday
+		<!-- /TMPL_IF -->
+		<!--TMPL_IF name="arrival7" -->
+				Sunday
+		<!-- /TMPL_IF -->
+		</b>
+		for <b>
+			<!-- TMPL_IF name="numberlength" --><!-- TMPL_VAR name="numberlength" --> issues<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="weeklength" --><!-- TMPL_VAR name="weeklength" --> weeks<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="monthlength" --><!-- TMPL_VAR name="monthlength" --> months<!-- /TMPL_IF -->
+			</b>
+		since <b><!-- TMPl_VAR name="startdate" --></b>
+		</p>
+		<p><!-- TMPL_VAR name="notes" --></p>
+	<!-- TMPL_IF name="opacnotes" -->
+		<h2 class="catalogue">Issues summary</h2>
+		<p>
+			<!-- TMPL_VAR name="opacnote" -->
+		</p>
+	<!-- /TMPL_IF -->
 </div>
-<form action="/cgi-bin/koha/opac-detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><p><input type="submit" class="submit" value="Back to Normal View" /></p></form>
-
+<!-- /TMPL_LOOP -->
 </div>
-</body>
-</html>
-
 
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/npl/en/opac-shelves.tmpl b/koha-tmpl/opac-tmpl/npl/en/opac-shelves.tmpl
index 9674b5c0ce..4c86c4b0fb 100644
--- a/koha-tmpl/opac-tmpl/npl/en/opac-shelves.tmpl
+++ b/koha-tmpl/opac-tmpl/npl/en/opac-shelves.tmpl
@@ -4,161 +4,131 @@
 
 <div id="main">
 <!-- TMPL_IF Name="viewshelf" -->
-<form>
+<form class="inline" action="/cgi-bin/koha/opac-shelves.pl" method="post" name="mainform">
     <table>
+	<caption>Contents of <em><!-- TMPL_VAR Name="shelfname" --></em></caption>
     		<tr>
-			<th colspan="4">
-				Contents of <!-- TMPL_VAR Name="shelfname" -->
-			</th>
+			<th><a href="/cgi-bin/koha/opac-shelves.pl" onclick="CheckAll(); return false;"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/checkall.gif" height="18" width="18" alt="Check All" title="Check All" border="0" /></a></th><th>&nbsp;</th><th>Title</th><th>Author</th><th>Call No.</th><th>Barcode</th><!-- TMPL_UNLESS NAME="itemsloop" --><th>&nbsp;</th><!-- /TMPL_UNLESS -->
 		</tr>
+		<!-- TMPL_IF NAME="itemsloop" -->
 		<!-- TMPL_LOOP Name="itemsloop" -->
-			<tr>
-				<!-- TMPL_IF name="color" -->
-					<td class="hilighted"><input type="checkbox" name="REM-<!-- TMPL_VAR Name="itemnumber" -->"></td>
-					<td class="hilighted"><a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR Name="barcode" --></a></td>
-					<td class="hilighted"><!-- TMPL_VAR Name="title" --></td>
-					<td class="hilighted"><!-- TMPL_VAR Name="author" --></td>
-				<!-- TMPL_ELSE -->
-					<td><input type="checkbox" name="REM-<!-- TMPL_VAR Name="itemnumber" -->"></td>
-					<td class="hilighted"><a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR Name="barcode" --></a></td>
-					<td><!-- TMPL_VAR Name="title" --></td>
+			<tr<!-- TMPL_IF name="color" --> class="highlight"<!-- /TMPL_IF -->>
+					<td><input type="checkbox" name="REM-<!-- TMPL_VAR Name="itemnumber" -->" /><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" -->" /></td>
+					<td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="itemtype" -->" title="<!-- TMPL_VAR NAME="itemtype" -->" /></td>
+					<td><a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR Name="title" --></a></td>
 					<td><!-- TMPL_VAR Name="author" --></td>
-				<!-- /TMPL_IF -->
-			</tr>
-		<!-- /TMPL_LOOP -->
+					<td><!-- TMPL_VAR NAME="classification" --></td>
+					<td><!-- TMPL_VAR Name="barcode" --></td>
+		</tr><!-- /TMPL_LOOP --><!-- TMPL_ELSE -->
+		<tr><td colspan="6">This shelf is empty.</td><!-- TMPL_UNLESS NAME="itemsloop" --><td><input type="hidden" name="DEL-<!-- TMPL_VAR NAME="shelfnumber" -->" /><input type="hidden" name="shelves" value="1" /><input type="submit" class="icon delete" value="Delete this Shelf" onclick="return confirmDelete('Are you sure you want to delete this shelf?')" /></td><!-- /TMPL_UNLESS --></tr>
+		<!-- /TMPL_IF -->
 	</table>
-	<br>
-	<a href="opac-shelves.pl" class="submit">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" -->">
-	<!-- TMPL_IF name="manageshelf" -->
-		<input type="submit" value="Remove Selected Items" class="submit">
-	<!-- /TMPL_IF -->
-</form>
-<!-- TMPL_IF name="manageshelf" -->
-<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" -->">
+	<!-- TMPL_IF name="manageshelf" --><!-- TMPL_IF NAME="itemsloop" --><input type="submit" value="Remove Selected Items" class="icon delete" onclick="return confirmDelete('Are you sure you want to remove these items from the shelf?')" /><!-- /TMPL_IF --><!-- /TMPL_IF --></form><!-- TMPL_IF name="manageshelf" --> <form class="inline" method="get" action="/cgi-bin/koha/opac-shelves.pl"><input type="hidden" name="op" value="modif" /><input type="hidden" value="<!-- TMPL_VAR Name="shelfnumber" -->" name="shelf" /><input type="submit" value="Modify this Shelf" class="icon edit" /></form>
+<br /><br />
+<form action="/cgi-bin/koha/opac-shelves.pl" method="post">
 	<table>
+		<tr><th colspan="2">Add an Item to this Shelf by Barcode</th></tr>
 		<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="submit">
-			</td>
+			<td><label for="addbarcode">Barcode:</label></td>
+			<td><input name="addbarcode" type="text" id="addbarcode" size="14" maxlength="14" /><input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR Name="shelfnumber" -->" /><input type="hidden" name="viewshelf" value="<!-- TMPL_VAR Name="shelfnumber" -->" /><input type="hidden" name="modifyshelfcontents" value="1" /><input type="submit" value="Save" class="submit" /></td>
 		</tr>
 	</table>
 </form>
 <!-- /TMPL_IF -->
+<form class="inline" method="get" action="opac-shelves.pl"><input type="submit" class="submit" value="Back to Virtual Shelves" /></form>
 <!-- TMPL_ELSE -->
 	<!-- TMPL_IF Name="shelves" -->
 		<!-- TMPL_IF Name="status1" -->
-			<font color="red"><!-- TMPL_VAR Name="string1" --></font><p>
+			<p class="error"><!-- TMPL_VAR Name="string1" --></p>
 		<!-- /TMPL_IF -->
 		<!-- TMPL_LOOP Name="paramsloop" -->
 			<!-- TMPL_IF Name="status" -->
-				<font color="red"><!-- TMPL_VAR Name="string" --></font><p>
+				<p class="error"><!-- TMPL_VAR Name="string" --></p>
 			<!-- /TMPL_IF -->
 		<!-- /TMPL_LOOP -->
-		
-		<h1>Bookshelves</h1>
-		<table border="0" cellpadding="7">
-			<tr>
-				<td align="center" valign="bottom">
-					<form>
-						<p>
-							<a href="opac-shelves.pl" class="submit">Shelf list</a>
-						</p>
+<div id="center">
+<form method="post" action="/cgi-bin/koha/opac-shelves.pl">
+		<input type="hidden" name="shelves" value="1">
+		<table>
+		<caption>Create a New a Virtual Shelf</caption>
+		<tr><td><label for="addshelf">Shelf Name:</label> </td><td> <input id="addshelf" type="text" name="addshelf" size="25"></td></tr>
+		<tr><td><label for="owner">Owner:</label> </td><td><input type="hidden" name="owner" id="owner" value="<!-- TMPL_VAR name="loggedinuser" -->"><!-- TMPL_VAR name="loggedinusername" --></td></tr>
+		<tr><td><label for="category">Category:</label> </td><td><select name="category" id="category">
+									<option value="1">Private</option>
+									<option value="2">Public</option>
+									<option value="3">Free</option>
+									</select></td></tr></table>
+		<ul><li>A <strong>private</strong> virtual shelf is managed by you and can be seen only by you.</li><li> A <strong>public</strong> virtual shelf can be seen by everybody, but managed only by you.</li>
+			<li> A <strong>free</strong> virtual shelf can be added to and changed by any user.</li></ul>
+								<p><input type="submit" value="Add New Shelf" class="submit"></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>Select Shelves to Delete
-							</th>
-						</tr>
+				</div>		
+		
+		<div id="right"><!-- TMPL_IF NAME="shelvesloop" -->
+		<form method="post" action="/cgi-bin/koha/opac-shelves.pl" name="mainform">
+					<input type="hidden" name="shelves" value="1" />
+					<table>
+					<caption>Delete Virtual Shelves</caption>
+						<tr><th>&nbsp;</th><th>Shelf Name</th><th>Contents</th></tr>
 						<!-- TMPL_LOOP Name="shelvesloop" -->
 						<!-- TMPL_IF name="canmanage" -->
 						<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>
+							<td><input type="checkbox" name="DEL-<!-- TMPL_VAR Name="shelf" -->" /></td><td><a href="/cgi-bin/koha/opac-shelves.pl?viewshelf=<!-- TMPL_VAR Name="shelf" -->"><!-- TMPL_VAR Name="shelfname" --></a></td><td><!-- TMPL_VAR Name="shelfbookcount" --> item(s)</td></tr>
 						<!-- /TMPL_IF -->
 						<!-- /TMPL_LOOP -->
 					</table>
-					<p>
-						<input type="submit" value="Delete Shelves" class="submit"></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>
-								<font color="white">Add Shelf</font>
-							</th>
-						</tr>
-						<tr>
-							<td>
-								<p>Name : <input type="text" name="addshelf" size="25"></p>
-								<p>Owner : <input type="hidden" name="owner" value="<!-- TMPL_VAR name="loggedinuser" -->"><!-- TMPL_VAR name="loggedinusername" --></p>
-								<p>Category : <select name="category">
-									<option value="1">Private</option>
-									<option value="2">Public</option>
-									<option value="3">Free</option>
-									</select>
-								</p>
-								<p> <li>a private bookshelf is managed by you &amp; can be seen only by you.</li>
-									<li> A public can be seen by everybody, but managed only by you.</li>
-									<li> A free can be managed by any user.</li>
-								</p>
-							</td>
-						</tr>
-					</table>
-								<p><input type="submit" value="Add New Shelf" class="submit"></p>
-					</form>
-				</td>
-			</tr>
-		</table>
-
+		<input type="submit" value="Delete Shelves" class="submit" /></form>
+		<!-- /TMPL_IF -->
+		<p><form class="inline" action="opac-shelves.pl" method="get"><input type="submit" class="submit" value="Back to Virtual Shelves" /></form></p>
+</div>
 	<!-- TMPL_ELSE -->
-		
-		<table>
-			<tr>
-				<th>
-				Shelf List
-				</th>
-			</tr>
-			<!-- TMPL_LOOP Name="shelvesloop" -->
-			<tr>
-				<!-- TMPL_IF name="color" -->
-					<td class="hilighted">
-				<!-- TMPL_ELSE -->
-					<td>
-				<!-- /TMPL_IF -->
-					<a href="opac-shelves.pl?viewshelf=<!-- TMPL_VAR Name="shelf" -->">
-						<!-- TMPL_VAR Name="shelfname" -->(<!-- TMPL_VAR Name="shelfbookcount" --> books)
-					</a>
-				</td>
-			</tr>
+	<!-- TMPL_IF name="edit" -->
+		<form method="post">
+			<input type="hidden" name="op" value="modifsave">
+			<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR name="shelfnumber" -->">
+			<table>
+			<caption>Modify Virtual Shelf <em><!-- TMPL_VAR name="shelfname"--></em></caption>
+			<tr><td><label for="shelfname">Shelf Name: </label></td><td><input type="text" id="shelfname" name="shelfname" size="25" value="<!-- TMPL_VAR name="shelfname"-->" /></td></tr>
+			<tr><td><label for="owner">Owner: </label></td><td><input type="hidden" id="owner" name="owner" value="<!-- TMPL_VAR NAME="loggedinuser" -->"><!-- TMPL_VAR NAME="loggedinusername" --></td></tr>
+			<tr><td><label for="category">Category: </label></td><td><select id="category" name="category">
+					<!-- TMPL_IF name="category1" -->
+						<option value="1" selected>Private</option>
+					<!-- TMPL_ELSE -->
+						<option value="1">Private</option>
+					<!-- /TMPL_IF -->
+					<!-- TMPL_IF name="category2" -->
+						<option value="2" selected>Public</option>
+					<!-- TMPL_ELSE -->
+						<option value="2">Public</option>
+					<!-- /TMPL_IF -->
+					<!-- TMPL_IF name="category3" -->
+						<option value="3" selected>Free</option>
+					<!-- TMPL_ELSE -->
+						<option value="3">Free</option>
+					<!-- /TMPL_IF -->
+				</select></td></tr>
+			</table>
+			<ul><li>A <strong>private</strong> virtual shelf is managed by you and can be seen <strong>only</strong> by you.</li>
+				<li> A <strong>public</strong> virtual shelf can be seen by <strong>everybody</strong>, but managed only by you.</li>
+				<li>A <strong>free</strong> virtual shelf can be added to or changed by <strong>any</strong> user.</li></ul>
+			<p><input type="submit" value="Save Changes" class="submit"></p>
+
+		</form>
+<!-- /TMPL_IF -->
+<table>
+<caption>Virtual Shelves</caption>
+<tr><th>Shelf Name</th><th>Category</th><th>Content Size</th><th>&nbsp;</th></tr>
+<!-- TMPL_LOOP Name="shelvesloop" -->
+<tr<!-- TMPL_IF name="color" --> class="highlight"<!-- /TMPL_IF -->><td><a href="opac-shelves.pl?viewshelf=<!-- TMPL_VAR Name="shelf" -->"><!-- TMPL_VAR Name="shelfname" --></a></td><td><!-- TMPL_IF NAME="category1" -->Private<!-- /TMPL_IF --><!-- TMPL_IF NAME="category2" -->Public<!-- /TMPL_IF --><!-- TMPL_IF NAME="category3" -->Free<!-- /TMPL_IF --></td><td><!-- TMPL_VAR Name="shelfbookcount" --> item(s)</td><td><!-- TMPL_IF name="mine" --><a href="opac-shelves.pl?op=modif&amp;shelf=<!-- TMPL_VAR NAME="shelf" -->">Modify</a><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr>
 			<!-- /TMPL_LOOP -->
 		</table>
-		<P>
-			<a href="opac-shelves.pl?shelves=1" class="submit">Add or Remove Book Shelves</a>
-		</p>
+		<p><form action="opac-shelves.pl" method="get"><input type="hidden" value="1" name="shelves" /><input type="submit" value="Add or Remove Book Shelves" class="submit" /></form></p>
 	<!-- /TMPL_IF -->
 <!-- /TMPL_IF -->
+
+<br clear="both" />
 </div>
 </body>
 </html>
diff --git a/koha-tmpl/opac-tmpl/unido/en/about.tmpl b/koha-tmpl/opac-tmpl/unido/en/about.tmpl
deleted file mode 100644
index ad38872649..0000000000
--- a/koha-tmpl/opac-tmpl/unido/en/about.tmpl
+++ /dev/null
@@ -1,86 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<!--
-
-design and HTML by rachel@katipo.co.nz, 
-templating by finlay@katipo.co.nz
-
-SEARCH
-
-This is the part of the "vanilla" theme put together by Katipo Communications for general distribution with Koha. 
-
-Add links to other searches etc to this page.
-
-If you don't wish people to search by these fields, or want to add others then this is the place to do it.
-
-If you see strange tags and comments you don't understand they may be out of Kea our content management system. If you'd like to use Kea to change your template & website text please contact Katipo.
-
-Cheers
-R
-
-12/1/03
-
--->
-<html>
-<head>
-<title>About the UNIDO Library</title>
-<link rel="stylesheet" href="includes/vanilla-main.css" type="text/css" />
-
-
-</head>
-<body marginheight="0" marginwidth="0">
-
-<!--START TOP TABLE-->
-<TMPL_INCLUDE name="vanilla-about-menu.inc">
-
-
-<!--START MAIN TABLE AND LEFT NAVIGATION-->
-<TMPL_INCLUDE name="includes/vanilla-left-nav.inc">
-
-<!--SEARCH FORM-->
-<TMPL_INCLUDE name="includes/vanilla-cat-search.inc">
-<!--END LEFT NAV, START CRUMBS-->
-<TMPL_INCLUDE name="includes/vanilla-crumb-start.inc">	
-<a href="/">Home</a> &gt; About
-<!--END CRUMBS-->
-<TMPL_INCLUDE name="includes/vanilla-crumb-end.inc">
-<!--CONTENT-->
-
-<h1>About the UNIDO Library</h1>
-<h3>Where is the library?</h3>
-The main library  is at the UNIDO headquarters, Vienna International Centre, Vienna, Austria, located in room D1042 and is open around the clock. 
-<ul>
-<li> <a href="http://www.unido.org/doc/3355">More about UNIDO</a> (United Nations Industrial Development Organisation)
-</ul>
-
-<h3>Who can use the library?</h3>
-Anyone with access to the VIC  can come to the library.
-<ul>
-<li> UNIDO Staff
-<li> Consultants
-<li> Interns
-<li> Other visitors
-<li> Staff from other UN Organisations
-</ul>
-
-<h3>Who can borrow from the library?</h3>
-<ul>
-<li>All UNIDO staff and interns
-<li> Other registered patrons
-</ul>
-
-If you are not a UNIDO staff memeber, but would like to become a registered patron please contact 
-<a href="mailto:Library@unido.org ?subject=Membership Enquiry">Library@unido.org</a>. 
-
-<h3>The Library Software</h3>
-The UNIDO library is running the <a href="http://www.koha.org">Koha open source library system</a>
-
-
-
-
-<!--BOTTOM NAVIGATION - ALL-->
-<TMPL_INCLUDE name="includes/vanilla-botnav-all.inc">
-
-<!--END MAIN TABLE-->
-<TMPL_INCLUDE name="includes/vanilla-end-main.inc">
-</body>
-</html>
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/unido/en/contact.tmpl b/koha-tmpl/opac-tmpl/unido/en/contact.tmpl
deleted file mode 100644
index 510c3ff827..0000000000
--- a/koha-tmpl/opac-tmpl/unido/en/contact.tmpl
+++ /dev/null
@@ -1,81 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<!--
-
-design and HTML by rachel@katipo.co.nz, 
-templating by finlay@katipo.co.nz
-
-SEARCH
-
-This is the part of the "vanilla" theme put together by Katipo Communications for general distribution with Koha. 
-
-Add links to other searches etc to this page.
-
-If you don't wish people to search by these fields, or want to add others then this is the place to do it.
-
-If you see strange tags and comments you don't understand they may be out of Kea our content management system. If you'd like to use Kea to change your template & website text please contact Katipo.
-
-Cheers
-R
-
-12/1/03
-
--->
-<html>
-<head>
-<title>Contact the UNIDO Library</title>
-<link rel="stylesheet" href="includes/vanilla-main.css" type="text/css" />
-
-
-</head>
-<body marginheight="0" marginwidth="0">
-
-
-<!--START TOP TABLE-->
-<TMPL_INCLUDE name="vanilla-contact-menu.inc">
-
-
-<!--START MAIN TABLE AND LEFT NAVIGATION-->
-<TMPL_INCLUDE name="includes/vanilla-left-nav.inc">
-
-<!--SEARCH FORM-->
-<TMPL_INCLUDE name="includes/vanilla-cat-search.inc">
-<!--END LEFT NAV, START CRUMBS-->
-<TMPL_INCLUDE name="includes/vanilla-crumb-start.inc">	
-<a href="/">Home</a> &gt; contact
-<!--END CRUMBS-->
-<TMPL_INCLUDE name="includes/vanilla-crumb-end.inc">
-
-<!--CONTENT-->
-
-<h1>Contact the UNIDO Library</h1>
-
-The UNIDO Library is located in room D1042 and is open around the clock.
-      <UL>
- 	  <LI>E-Mail: <A HRef="mailto:Library@unido.org">Library@unido.org</A>
-
-      <LI>Library Enquiries: Mr <A HRef="mailto:S.Khan@unido.org">Shafiqur Khan</A>, (+43 1) 26026 Ext. 3686
-      <LI>Orders: Ms <A HRef="mailto:E.Mayer@unido.org">Elisabeth Mayer</A>, (+43 1) 26026 Ext. 5031
-      <LI>Journal Circulation: Ms <A HRef="mailto:N.Akhter@unido.org">Naeem Akhter</A>,(+43 1) 26026  Ext. 5532 (AM)
-
-      </UL>
-<h3>Address</h3>
-<b>United Nations Industrial Development Organization <br>
-UNIDO</b> <br>
-Vienna International Centre <br>
-P.O. Box 300 <br>
-A-1400 Vienna, Austria <br>
-Tel: (+43 1) 26026 <br>
-Fax: (+43 1 ) 2692669 <br>
-Internet address: <a href="http://www.unido.org/library/">www.unido.org/library/</a>
-
-
-
-
-
-<!--BOTTOM NAVIGATION - ALL-->
-<TMPL_INCLUDE name="includes/vanilla-botnav-all.inc">
-
-<!--END MAIN TABLE-->
-<TMPL_INCLUDE name="includes/vanilla-end-main.inc">
-</body>
-</html>
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/unido/en/images/unido-home-photos.jpg b/koha-tmpl/opac-tmpl/unido/en/images/unido-home-photos.jpg
deleted file mode 100644
index bd852cf8fa5401d15a5cd250a192579ecaf5baac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 26212
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

diff --git a/koha-tmpl/opac-tmpl/unido/en/images/unido-logo.gif b/koha-tmpl/opac-tmpl/unido/en/images/unido-logo.gif
deleted file mode 100644
index 803f540dc5b78a0d887ffbcbb3c80fa3d4dc9a84..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 902
zcmV;119|*MNk%w1VJiSC0J8u9sZtsInltfo3KR({PbVM$mL>kDHOO@-{f8LVWe&tx
z4vat;=#4PjfGhWpEdQA_A^8LV00000EC2ui04o40000F4@X7fCy;$1J`KH$PWx?2)
z8fF;5+PY|mg{x*D!UE(Ak01t_N5V2B7LOaC*Ju<H1wnJ6Ls$e>Aq8L@Gz?3H^CwUc
z7C%Nq0YE$i12=2<Kr9-Ah2d~7AeK9M3OWr41#Aco3j_!U0x||v1Ox&HUV8vy2L+T4
z4VDX=W{Cp{ltC32djkY{IRFO-us?q~Qg*D4Rjj22BzyzGY+O`8vI3bqIspr;0$>0D
ztY@efRICbYn6R>KM$fVe3Be0dJCnf;CIM&I009L(c4&JI1PTWZVE4g~WsB2NNhsi8
zKs1Aoju>b_s6jLW(F8CM08tu&0s)plY;{2af&pg#cDU(LV8?@q0R#w0NeNB@X$n$G
zgEOGoNd^a1GGOLFWrYM#dSZklprnEaFAWrk_lf}p22_B?qrxLWN~%$LM2%^HfrBGd
zdLW??3_z4%185F7o0gnfUPvOLB{y~gxi@anCZL(a6*&cHRgz=a@50@2c@PIf+;;(D
zD1h@cOWP%nVaqgo%+=dWvq5;|&^joA_OhOWiG#HY+?i&A3glLo2%s7S+5jK@dYOAf
zcT8!L`+>PjVKP9FG;#GKr+D&!SgM^LxWH-df}X()wW8E20fI@ZsYMD;?Lq)kXXJe+
z5Npu^I|LGRTjKapN`~<%jleDLo;WV?fRs)DBLIOHUk)qbu!ba$T#&;c55ZE>J+#1r
z4q6MC;gJFqX_SdT695n&4y6qE#{pvmz@a7Nw2{m>m4vik36nT7i4L38g3nh96rdV_
z*_cw3B?QF4QXZ=zqW}XXMPy4fR;&?CGx)Hw6A39zqXQ*NB+$S_e_#>7m&1(Hj787P
zpusDdeAJ^3J2U}Q125UaOj~Ef1Y!yy3P@N23^1@)G=u^G6q7I>amG6_qyW`+%@nCr
zpp*u>RF<V^>68`$I3Qwrjsew!RX_;<)LxQcv#AUsAQM)k=^50Dh^&N_Nl|;!@zrsX
z0S3z=sq&J|N?Mp#fJ4#b6H)<_Qo(>TEL42rK(RBdV67cy(Qp8JD=g&#wQ7dY$Q-FG
clureXf@>ZsBYZnSx<ZHm0txSyAVdTJI|eOV*8l(j

diff --git a/koha-tmpl/opac-tmpl/unido/en/includes/crumb-end.inc b/koha-tmpl/opac-tmpl/unido/en/includes/crumb-end.inc
deleted file mode 100644
index 37918504b4..0000000000
--- a/koha-tmpl/opac-tmpl/unido/en/includes/crumb-end.inc
+++ /dev/null
@@ -1 +0,0 @@
-  </div>
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/unido/en/includes/crumb-start.inc b/koha-tmpl/opac-tmpl/unido/en/includes/crumb-start.inc
deleted file mode 100644
index 4a87bcf7a6..0000000000
--- a/koha-tmpl/opac-tmpl/unido/en/includes/crumb-start.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-  </td>
-  <td width="5"><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width="5" height="1" border="0" alt="" /></td>
-  <td width="35"><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width="35" height="1" border="0" alt="" /></td>
-  <td><div class="crumb"><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width="1" height="35" border="0" align="right" alt="" />
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/unido/en/includes/home-modern.css b/koha-tmpl/opac-tmpl/unido/en/includes/home-modern.css
deleted file mode 100644
index dc219f1fbf..0000000000
--- a/koha-tmpl/opac-tmpl/unido/en/includes/home-modern.css
+++ /dev/null
@@ -1,32 +0,0 @@
-input.ok  {
-  background-color: #d59b61;
-  font-family: arial, helvetica, sans-serif;
-  font-size: 14px;
-  font-weight: bold;
-
-  text-align: center;
-  border: 1px;
-  border-color: #000000;
-  border-style: solid;
-  padding: 4px;
- height : 28px;
-}
-
-
-.search-heading {
-   
-  margin-bottom: 44px;
-  line-height: 60px;
-   
-}
-
-
-h1 {
-  font-family: ocean sans, garamond, times, serif;
-  font-size: 48px;
-  font-weight: normal;
-  font-style: italic;
-  margin-bottom: 44px;
-  line-height: 60px; 
-
-  }
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/unido/en/includes/itemtype-image.inc b/koha-tmpl/opac-tmpl/unido/en/includes/itemtype-image.inc
deleted file mode 100644
index e0a139e196..0000000000
--- a/koha-tmpl/opac-tmpl/unido/en/includes/itemtype-image.inc
+++ /dev/null
@@ -1,45 +0,0 @@
-<TMPL_IF NAME="book">
-<IMG SRC="<TMPL_VAR NAME='themelang'>/images/book.gif" WIDTH="50" HEIGHT="45" BORDER="0">
-</TMPL_IF>
-<TMPL_IF NAME="largeprint">
-<IMG SRC="<TMPL_VAR NAME='themelang'>/images/large-print.gif" WIDTH="50" HEIGHT="45" BORDER="0">
-</TMPL_IF>
-<TMPL_IF NAME="picture">
-<IMG SRC="<TMPL_VAR NAME='themelang'>/images/magazine.gif" WIDTH="50" HEIGHT="45" BORDER="0">
-</TMPL_IF>
-<TMPL_IF NAME="cdrom">
-<IMG SRC="<TMPL_VAR NAME='themelang'>/images/disk.gif" WIDTH="50" HEIGHT="45" BORDER="0">
-</TMPL_IF>
-<TMPL_IF NAME="cassette">
-<IMG SRC="<TMPL_VAR NAME='themelang'>/images/disk.gif" WIDTH="50" HEIGHT="45" BORDER="0">
-</TMPL_IF>
-<TMPL_IF NAME="cd">
-<IMG SRC="<TMPL_VAR NAME='themelang'>/images/disk.gif" WIDTH="50" HEIGHT="45" BORDER="0">
-</TMPL_IF>
-<TMPL_IF NAME="video">
-<IMG SRC="<TMPL_VAR NAME='themelang'>/images/tape.gif" WIDTH="50" HEIGHT="45" BORDER="0">
-</TMPL_IF>
-<TMPL_IF NAME="bag">
-<IMG SRC="<TMPL_VAR NAME='themelang'>/images/book.gif" WIDTH="50" HEIGHT="45" BORDER="0">
-</TMPL_IF>
-<TMPL_IF NAME="magazine">
-<IMG SRC="<TMPL_VAR NAME='themelang'>/images/magazine.gif" WIDTH="50" HEIGHT="45" BORDER="0">
-</TMPL_IF>
-<TMPL_IF NAME="puzzle">
-<IMG SRC="<TMPL_VAR NAME='themelang'>/images/jigsaw.gif" WIDTH="50" HEIGHT="45" BORDER="0">
-</TMPL_IF>
-<TMPL_IF NAME="picturebook">
-<IMG SRC="<TMPL_VAR NAME='themelang'>/images/picture-book.gif" WIDTH="50" HEIGHT="45" BORDER="0">
-</TMPL_IF>
-<TMPL_IF NAME="map">
-<IMG SRC="<TMPL_VAR NAME='themelang'>/images/map.gif" WIDTH="50" HEIGHT="45" BORDER="0">
-</TMPL_IF>
-<TMPL_IF NAME="photograph">
-<IMG SRC="<TMPL_VAR NAME='themelang'>/images/magazine.gif" WIDTH="50" HEIGHT="45" BORDER="0">
-</TMPL_IF>
-<TMPL_IF NAME="talkingbook">
-<IMG SRC="<TMPL_VAR NAME='themelang'>/images/talking-book.gif" WIDTH="50" HEIGHT="45" BORDER="0">
-</TMPL_IF>
-<TMPL_IF NAME="dvd">
-<IMG SRC="<TMPL_VAR NAME='themelang'>/images/dvd.gif" WIDTH="50" HEIGHT="45" BORDER="0">
-</TMPL_IF>
diff --git a/koha-tmpl/opac-tmpl/unido/en/includes/koha.css b/koha-tmpl/opac-tmpl/unido/en/includes/koha.css
deleted file mode 100644
index fcf15d833c..0000000000
--- a/koha-tmpl/opac-tmpl/unido/en/includes/koha.css
+++ /dev/null
@@ -1,161 +0,0 @@
-.heading1
-{font-family:arial,helvetica;font-size:180%;color:#A88050}
-
-.heading1bold
-{font-family:arial,helvetica;font-size:180%;
-font-weight:bold;
-color:#A88050}
-
-
-.heading4 {font-family:arial,helvetica;
-font-size:110%;
-color:#614523;
-font-weight:bold;
-margin-bottom:0px;
-padding-bottom:0px}
-
- input.checkbox
-{font-family:monospace;
-font-size:25px;
-size:25px;
-height:25px;
-width:25px;
-}
-.small {font-size:90%;
-font-family: arial,helvetica;
-margin-bottom:3pt;
-}
-
-.tiny {font-size:x-small;
-font-family: arial,helvetica;
-}
-
-
-.pink{
-background-color:#FEEDDB;
-padding: 5px;
-}
-
-.plain{
-padding: 5px;}
-
-.tan{
-background-color:#A88050;}
-
-.selected{
-color:#C96029;
-font-weight:bold;
-padding: 3px;
-}
-
-.selected-lge{
-color:#C96029;
-font-size:120%;
-font-family: arial,helvetica;
-font-weight:bold;
-padding:3px;
-}
-
-.padded{
-padding: 5px;
-font-size:small;
-}
-
-.dk-brown{
-background-color:#4E300C;}
-
-.green{
-background-color:#E0EBDD;}
-
-.search-number {
-    font-family: verdana,arial,hevetica;
-  font-size: small;
-  font-weight: bold;
-text-decoration: none;
- width: 17px;
-height: 17px;
-padding: 2px;
-border-right: 1px;
-border-bottom: 1px;
-border-left: 1px;
-border-top: 1px;
-  border-style: solid;
-  border-color: #354E27;
-    }
-.selected-number {
-    font-family: verdana,arial,hevetica;
-  font-size: small;
-  font-weight: bold;
-text-decoration: none;
-background-color:#FEEDDB;
- width: 17px;
-height: 17px;
-padding: 2px;
-border-right: 1px;
-border-bottom: 1px;
-border-left: 1px;
-border-top: 1px;
-  border-style: solid;
-  border-color: #354E27;
-    }
-.selected-box {
-   background-color:#E3A46D;
-padding:0px;
-    }
-
-.green-box {
-background-color: #344E26;
-  font-family:verdana,arial,hevetica;
-font-size:small;
-font-weight:bold;
-color: #FEEDDB;
-   border-top: 1px;
-border-right: 1px;
-border-bottom: 1px;
-border-left: 1px;
-padding: 4px;
-  border-style: solid;
-  border-color: #667755;
-    }
-
-.brown-box {
-background-color:#A88050;
-   font-family:verdana,arial,hevetica;
-font-size:small;
-font-weight:bold;
-color: #FEEDDB;
- border-top: 1px;
-border-right: 1px;
-border-bottom: 1px;
-border-left: 1px;
-padding: 4px;
-  border-style: solid;
-  border-color: #817567;
-    }
-.table-heading {
-background-color:#D7AB7A;
-   font-family:verdana,arial,hevetica;
-font-size:small;
-font-weight:bold;
- padding: 5px;
-       }
-.white-box {
-background-color:#ffffff;
-    border-top: 1px;
-border-right: 1px;
-border-bottom: 1px;
-border-left: 1px;
-padding: 0px;
-  border-style: solid;
-  border-color: #4E300E;
-    }
-.fines-box {
-background-color:#E3A46D;
-    border-top: 1px;
-border-right: 1px;
-border-bottom: 1px;
-border-left: 1px;
-padding: 0px;
-  border-style: solid;
-  border-color: #4E300E;
-    }
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/unido/en/includes/main.css b/koha-tmpl/opac-tmpl/unido/en/includes/main.css
deleted file mode 100644
index 2547e663a5..0000000000
--- a/koha-tmpl/opac-tmpl/unido/en/includes/main.css
+++ /dev/null
@@ -1,361 +0,0 @@
-/*
-What is
-*.search-number
-
-*/
-
-*.search-number {
-  border-bottom: 1px;
-  border-color: #354E27;
-  border-left: 1px;
-  border-right: 1px;
-  border-style: solid;
-  border-top: 1px;
-  display: inline;
-  font-family: verdana,arial,hevetica;
-  font-size: small;
-  font-weight: bold;
-  height: 17px;
-  padding: 2px;
-  text-decoration: none;
-  width: 17px;
-}
-
-*.selected-number {
-  background-color: #FEEDDB;
-  border-bottom: 1px;
-  border-color: #354E27;
-  border-left: 1px;
-  border-right: 1px;
-  border-style: solid;
-  border-top: 1px;
-  font-family: verdana,arial,hevetica;
-  font-size: small;
-  font-weight: bold;
-  height: 17px;
-  padding: 2px;
-  text-decoration: none;
-  width: 17px;
-}
-
-a {
-  color: #BF470A;
-  font-weight: bold;
-}
-
-a:visited {
-  color: #BF740A;
-}
-
-a:hover {
-  color: #000000;
-}
-
-a.button:hover {
-  background: transparent;
-  padding: 0;
-}
-
-body {
-  background-color: #FFFFFF;
-  font-family: verdana,arial,helvetica, san-serif;
-  margin: 0px;
-  padding: 0px;
-}
-
-h1 {
-  color: #A88050;
-  font-family: arial,helvetica;
-  font-size: 180%;
-}
-
-h2 {
-  color: #A88050;
-  font-family: arial,helvetica;
-  font-size: 160%;
-  margin-bottom: 0px;
-  padding-bottom: 0px;
-}
-
-h3 {
-  color: #614523;
-  font-family: arial,helvetica;
-  font-size: 130%;
-  margin-bottom: 0px;
-  padding-bottom: 0px;
-}
-
-h4 {
-  color: #614523;
-  font-family: arial,helvetica;
-  font-size: 110%;
-  margin-bottom: 0px;
-  padding-bottom: 0px;
-}
-
-input {
-  font-family: monospace;
-  font-size: 12px;
-}
-
-input.checkbox {
-  font-family: monospace;
-  font-size: 25px;
-  height: 25px;
-  size: 25px;
-  width: 25px;
-}
-
-p,ul,ol,li {
-  font-family: verdana,arial,helvetica;
-  font-size: 12px;
-  line-height: 20px;
-}
-
-td {
-  font-family: verdana,arial,helvetica;
-  font-size: 12px;
-}
-
-.botnav a:link {
-  color: #41622F;
-  font-family: verdana,arial,helvetica;
-  font-size: 10pt;
-  font-weight: normal;
-}
-
-.botnav a:visited {
-  color: #909E88;
-  font-family: verdana,arial,helvetica;
-  font-size: 10pt;
-  font-weight: normal;
-}
-
-.botnav a:hover {
-  background: #E3A46D;
-  color: #000000;
-}
-
-.brown-box {
-  background-color: #A88050;
-  border-bottom: 1px;
-  border-color: #817567;
-  border-left: 1px;
-  border-right: 1px;
-  border-style: solid;
-  border-top: 1px;
-  color: #FEEDDB;
-  font-family: verdana,arial,hevetica;
-  font-size: small;
-  font-weight: bold;
-  padding: 4px;
-}
-
-.crumb {
-  color: #000000;
-  font-weight: normal;
-}
-
-.crumb a:link {
-  color: #41622F;
-  font-weight: normal;
-}
-
-.crumb a:visited {
-  color: #909E88;
-  font-weight: normal;
-}
-
-.crumb a:hover {
-  background: #E3A46D;
-  color: #000000;
-}
-
-.dk-brown{
-  background-color: #4E300C;
-}
-
-.fines-box {
-  background-color: #E3A46D;
-  border-bottom: 1px;
-  border-color: #4E300E;
-  border-left: 1px;
-  border-right: 1px;
-  border-style: solid;
-  border-top: 1px;
-  padding: 0px;
-}
-
-.green{
-  background-color: #E0EBDD;
-}
-
-.green-box {
-  background-color: #344E26;
-  border-bottom: 1px;
-  border-color: #667755;
-  border-left: 1px;
-  border-right: 1px;
-  border-style: solid;
-  border-top: 1px;
-  color: #FEEDDB;
-  font-family: verdana,arial,hevetica;
-  font-size: small;
-  font-weight: bold;
-  padding: 4px;
-}
-
-.head1 {
-  color: #A88050;
-  font-family: arial,helvetica;
-  font-size: 180%;
-}
-
-.head1bold {
-  color: #A88050;
-  color: #A88050;
-  font-family: arial,helvetica;
-  font-size: 180%;
-  font-weight: bold;
-}
-
-.head2{
-  color: #A88050;
-  font-family: arial,helvetica;
-  font-size: 160%;
-  margin-bottom: 0px;
-  padding-bottom: 0px;
-}
-
-.head2bold {
-  color: #A88050;
-  font-family: arial,helvetica;
-  font-size: 160%;
-  font-weight: bold;
-  margin-bottom: 0px;
-  padding-bottom: 0px;
-}
-
-.heading4 {
-  color: #614523;
-  font-family: arial,helvetica;
-  font-size: 110%;
-  font-weight: bold;
-  margin-bottom: 0px;
-  padding-bottom: 0px;
-}
-
-.main {
-  font-family: verdana,arial,helvetica;
-  font-size: 12px;
-}
-
-.navhead {
-  font-weight: bold;
-}
-
-.padded{
-  font-size: 12px;
-  padding: 5px;
-}
-
-.pink{
-  background-color: #FEEDDB;
-  padding: 5px;
-}
-
-.plain{
-  padding: 5px;
-}
-
-.search {
-  font-family: verdana,arial,hevetica;
-  font-size: 7.5pt;
-  font-weight: bold;
-}
-
-.selected{
-  color: #C96029;
-  font-weight: bold;
-  padding: 3px;
-}
-
-.selected-box {
-  background-color: #E3A46D;
-  padding: 0px;
-}
-
-.selected-lge{
-  color: #C96029;
-  font-family: arial,helvetica;
-  font-size: 120%;
-  font-weight: bold;
-  padding: 3px;
-}
-
-.shade{
-  background-color: #DCCAB4;
-  padding: 5px;
-}
-
-.sidenav {
-  color: #41622F;
-  font-size: 9pt;
-  font-weight: normal;
-  line-height: 13px;
-  margin-bottom: 3pt;
-}
-
-.sidenav a:link {
-  color: #41622F;
-  font-size: 9pt;
-  font-weight: normal;
-  line-height: 13px;
-  margin-bottom: 3pt;
-}
-
-.sidenav a:visited {
-  color: #41622F;
-  font-size: 9pt;
-  font-weight: normal;
-  margin-bottom: 3pt;
-}
-
-.sidenav a:hover {
-  background: #E3A46D;
-  color: #000000;
-}
-
-.small {
-  font-family: arial,helvetica;
-  font-size: 90%;
-  margin-bottom: 3pt;
-}
-
-.table-heading {
-  background-color: #D7AB7A;
-  font-family: verdana,arial,hevetica;
-  font-size: small;
-  font-weight: bold;
-  padding: 5px;
-}
-
-.tan{
-  background-color: #A88050;
-}
-
-.tiny {
-  font-family: arial,helvetica;
-  font-size: x-small;
-}
-
-.white-box {
-  background-color: #FFFFFF;
-  border-bottom: 1px;
-  border-color: #4E300E;
-  border-left: 1px;
-  border-right: 1px;
-  border-style: solid;
-  border-top: 1px;
-  padding: 0px;
-}
diff --git a/koha-tmpl/opac-tmpl/unido/en/includes/opac.css b/koha-tmpl/opac-tmpl/unido/en/includes/opac.css
deleted file mode 100644
index 46dc487720..0000000000
--- a/koha-tmpl/opac-tmpl/unido/en/includes/opac.css
+++ /dev/null
@@ -1,222 +0,0 @@
-body {background-color:#ffffff;
-font-family:verdana,arial,helvetica;
-margin:0px;
-padding:0px}
-
-a {color:#41622F;
-}
-
-a:visited {color:#4D300D;
-}
-/*
-blue
-a:visited {color:#10496E}
-*/
-h1 {font-family:verdana,arial,helvetica;
-font-size:180%;
-color:#A88050}
-
-h2 {font-family:verdana,arial,helvetica;
-font-size:160%;
-color:#A88050;
-margin-bottom:0px;
-padding-bottom:0px}
-
-h3 {font-family:verdana,arial,helvetica;
-font-size:130%;
-color:#614523;
-margin-bottom:0px;
-padding-bottom:0px}
-
-.botnav {font-family:verdana,arial,helvetica;
-font-size:10pt;
-color:#41622F;
-}
-
-.botnav a {font-family:verdana,arial,helvetica;
-font-size:10pt;
-color:#41622F;
-}
-
-p {font-family:verdana,arial,helvetica;
-font-size:10pt;
-}
-
-td {font-family:verdana,arial,helvetica;
-font-size:10pt;
-}
-
-ul {font-family:verdana,arial,helvetica;
-font-size:10pt;
-}
-
-ol {font-family:verdana,arial,helvetica;
-font-size:10pt;
-}
-
-li {font-family:verdana,arial,helvetica;
-font-size:10pt;
-}
-
-.main {font-family:verdana,arial,helvetica;
-font-size:10pt;
-}
-
-input {font-family:monospace;
-font-size:12px}
-
-.navhead {font-weight:bold}
-
-.sidenav {font-size:9pt;color:#41622F;
-font-family: arial,helvetica;
-margin-bottom:3pt;
-}
-.small {font-size:9pt;
-font-family: arial,helvetica;
-margin-bottom:3pt;
-}
-
-.tiny {font-size:7pt;
-font-family: arial,helvetica;
-}
-
-.crumb {color:#41622F;
-}
-
-.crumb a:visited {color:#41622F;
-}
-
-.pink{
-background-color:#FEEDDB;
-padding: 5px;
-}
-
-.plain{
-padding: 5px;}
-
-.tan{
-background-color:#A88050;}
-
-.selected{
-color:#C96029;
-font-weight:bold;
-}
-
-.selected-lge{
-color:#C96029;
-font-size:120%;
-font-family: arial,helvetica;
-font-weight:bold;
-}
-
-.padded{
-padding: 2px;}
-
-.dk-brown{
-background-color:#4E300C;}
-
-.search {font-family:verdana,arial,hevetica;
-font-size:7.5pt;
-font-weight:bold}
-
-.search-number {
-    font-family: verdana,arial,hevetica;
-  font-size: 8pt;
-  font-weight: bold;
-text-decoration: none;
- width: 17px;
-height: 17px;
-padding: 2px;
-border-right: 1px;
-border-bottom: 1px;
-border-left: 1px;
-border-top: 1px;
-  border-style: solid;
-  border-color: #354E27;
-    }
-.selected-number {
-    font-family: verdana,arial,hevetica;
-  font-size: 8pt;
-  font-weight: bold;
-text-decoration: none;
-background-color:#FEEDDB;
- width: 17px;
-height: 17px;
-padding: 2px;
-border-right: 1px;
-border-bottom: 1px;
-border-left: 1px;
-border-top: 1px;
-  border-style: solid;
-  border-color: #354E27;
-    }
-.selected-box {
-   background-color:#E3A46D;
-padding:0px;
-    }
-
-.green-box {
-background-color: #344E26;
-  font-family:verdana,arial,hevetica;
-font-size:8pt;
-font-weight:bold;
-color: #FEEDDB;
-   border-top: 1px;
-border-right: 1px;
-border-bottom: 1px;
-border-left: 1px;
-padding: 4px;
-  border-style: solid;
-  border-color: #667755;
-    }
-
-.brown-box {
-background-color:#A88050;
-   font-family:verdana,arial,hevetica;
-font-size:8pt;
-font-weight:bold;
-color: #FEEDDB;
- border-top: 1px;
-border-right: 1px;
-border-bottom: 1px;
-border-left: 1px;
-padding: 4px;
-  border-style: solid;
-  border-color: #817567;
-    }
-.table-heading {
-background-color:#D7AB7A;
-   font-family:verdana,arial,hevetica;
-font-size:12pt;
-font-weight:bold;
- border-top: 2px;
-border-right: 0px;
-border-bottom: 2px;
-border-left: 0px;
-padding: 5px;
-  border-style: solid;
-  border-color: #4E300C;
-    }
-.white-box {
-background-color:#ffffff;
-    border-top: 1px;
-border-right: 1px;
-border-bottom: 1px;
-border-left: 1px;
-padding: 2px;
-  border-style: solid;
-  border-color: #4E300E;
-    }
-.fines-box {
-background-color:#E3A46D;
-    border-top: 1px;
-border-right: 1px;
-border-bottom: 1px;
-border-left: 1px;
-padding: 0px;
-  border-style: solid;
-  border-color: #4E300E;
-    }
-checkbox{
- font-size:160%;
-}
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/unido/en/includes/script.js b/koha-tmpl/opac-tmpl/unido/en/includes/script.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/koha-tmpl/opac-tmpl/unido/en/includes/vanilla-about-menu.inc b/koha-tmpl/opac-tmpl/unido/en/includes/vanilla-about-menu.inc
deleted file mode 100644
index 1e7d321c3e..0000000000
--- a/koha-tmpl/opac-tmpl/unido/en/includes/vanilla-about-menu.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-<table class="opac-menu" width="100%" border=0>
-<TR class="opac-background">
-
-<td><div class="logo"><h1>UNIDO: About</h1></div></td>
-
-
-<td align=right>
-<TMPL_INCLUDE name="vanilla-menu.inc"></td>
-</tr>
-
-
-</table>
-<p>
-
diff --git a/koha-tmpl/opac-tmpl/unido/en/includes/vanilla-about-menu.tmpl b/koha-tmpl/opac-tmpl/unido/en/includes/vanilla-about-menu.tmpl
deleted file mode 100644
index 7e23371e3a..0000000000
--- a/koha-tmpl/opac-tmpl/unido/en/includes/vanilla-about-menu.tmpl
+++ /dev/null
@@ -1,86 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<!--
-
-design and HTML by rachel@katipo.co.nz, 
-templating by finlay@katipo.co.nz
-
-SEARCH
-
-This is the part of the "vanilla" theme put together by Katipo Communications for general distribution with Koha. 
-
-Add links to other searches etc to this page.
-
-If you don't wish people to search by these fields, or want to add others then this is the place to do it.
-
-If you see strange tags and comments you don't understand they may be out of Kea our content management system. If you'd like to use Kea to change your template & website text please contact Katipo.
-
-Cheers
-R
-
-12/1/03
-
--->
-<html>
-<head>
-<title>About the UNIDO Library</title>
-<link rel="stylesheet" href="includes/vanilla-main.css" type="text/css" />
-
-
-</head>
-<body marginheight="0" marginwidth="0">
-
-<!--START TOP TABLE-->
-<TMPL_INCLUDE name="vanilla-about-menu.inc">
-
-
-<!--START MAIN TABLE AND LEFT NAVIGATION-->
-<TMPL_INCLUDE name="includes/vanilla-left-nav.inc">
-
-<!--SEARCH FORM-->
-<TMPL_INCLUDE name="includes/vanilla-cat-search.inc">
-<!--END LEFT NAV, START CRUMBS-->
-<TMPL_INCLUDE name="includes/vanilla-crumb-start.inc">	
-<a href="/">Home</a> &gt;<a href='/about.html'>About</a>
-<!--END CRUMBS-->
-<TMPL_INCLUDE name="includes/vanilla-crumb-end.inc">
-<!--CONTENT-->
-
-<h1>About the UNIDO Library</h1>
-<h3>Where is the library?</h3>
-The main library  is at the UNIDO headquaters, Vienna International Centre, Vienna, Austria, located in room D1042 and is open around the clock. 
-<ul>
-<li> <a href="http://www.unido.org/doc/3355">More about UNIDO</a> (United Nations Industrial Development Organisation)
-</ul>
-
-<h3>Who can use the library?</h3>
-Anyone with access to the VIC campus can come to the library -ie.
-<ul>
-<li> UNIDO Staff
-<li> Consultants
-<li> Interns
-<li> Other visitors
-<li> Staff from other UN Organisations on campus
-</ul>
-
-<h3>Who can borrow from the library?</h3>
-<ul>
-<li>All UNIDO staff and interns
-<li> Other registered patrons
-</ul>
-
-If you are not a UNIDO staff memeber, but would like to become a registered patron please contact 
-<a href="mailto:Library@unido.org ?subject=Membership Enquiry">Library@unido.org </a>.  
-
-<h3>The Library Software</h3>
-The UNIDO library is running the <a href="http://www.koha.org">Koha open source library system</a>
-
-
-
-
-<!--BOTTOM NAVIGATION - ALL-->
-<TMPL_INCLUDE name="includes/vanilla-botnav-all.inc">
-
-<!--END MAIN TABLE-->
-<TMPL_INCLUDE name="includes/vanilla-end-main.inc">
-</body>
-</html>
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/unido/en/includes/vanilla-botnav-all.inc b/koha-tmpl/opac-tmpl/unido/en/includes/vanilla-botnav-all.inc
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/koha-tmpl/opac-tmpl/unido/en/includes/vanilla-cat-search.inc b/koha-tmpl/opac-tmpl/unido/en/includes/vanilla-cat-search.inc
deleted file mode 100644
index 4a55c7ab5e..0000000000
--- a/koha-tmpl/opac-tmpl/unido/en/includes/vanilla-cat-search.inc
+++ /dev/null
@@ -1,4 +0,0 @@
- <p>&nbsp;</p> <form action="/cgi-bin/koha/opac-searchresults.pl" method="post">
-  <div class="search">Search the Catalogue</div>
-  <input type="text" name="words" size="12" alt="Search the catalogues" />&nbsp;<input type="image" name="Go" src="<TMPL_VAR name='themelang'>/images/styles/home-go-button.gif" alt="Go" align="absmiddle" border="0" />
-  </form>
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/unido/en/includes/vanilla-contact-menu.tmpl b/koha-tmpl/opac-tmpl/unido/en/includes/vanilla-contact-menu.tmpl
deleted file mode 100644
index 1e7d321c3e..0000000000
--- a/koha-tmpl/opac-tmpl/unido/en/includes/vanilla-contact-menu.tmpl
+++ /dev/null
@@ -1,14 +0,0 @@
-<table class="opac-menu" width="100%" border=0>
-<TR class="opac-background">
-
-<td><div class="logo"><h1>UNIDO: About</h1></div></td>
-
-
-<td align=right>
-<TMPL_INCLUDE name="vanilla-menu.inc"></td>
-</tr>
-
-
-</table>
-<p>
-
diff --git a/koha-tmpl/opac-tmpl/unido/en/includes/vanilla-crumb-end.inc b/koha-tmpl/opac-tmpl/unido/en/includes/vanilla-crumb-end.inc
deleted file mode 100644
index 37918504b4..0000000000
--- a/koha-tmpl/opac-tmpl/unido/en/includes/vanilla-crumb-end.inc
+++ /dev/null
@@ -1 +0,0 @@
-  </div>
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/unido/en/includes/vanilla-crumb-start.inc b/koha-tmpl/opac-tmpl/unido/en/includes/vanilla-crumb-start.inc
deleted file mode 100644
index f3e81b4ea5..0000000000
--- a/koha-tmpl/opac-tmpl/unido/en/includes/vanilla-crumb-start.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-  </td>
-  <td width="5"><img src="/images/holder.gif" width="5" height="1" border="0" alt="" /></td>
-  <td width="35"><img src="/images/holder.gif" width="35" height="1" border="0" alt="" /></td>
-  <td><div class="crumb"><img src="/images/holder.gif" width="1" height="35" border="0" align="right" alt="" />
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/unido/en/includes/vanilla-end-main.inc b/koha-tmpl/opac-tmpl/unido/en/includes/vanilla-end-main.inc
deleted file mode 100644
index 876355eef2..0000000000
--- a/koha-tmpl/opac-tmpl/unido/en/includes/vanilla-end-main.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-  </td><td><img src="/images/holder.gif" width="32" height="1" alt=" "></td></tr>
-</table>
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/unido/en/includes/vanilla-key.inc b/koha-tmpl/opac-tmpl/unido/en/includes/vanilla-key.inc
deleted file mode 100644
index aa9afb2af1..0000000000
--- a/koha-tmpl/opac-tmpl/unido/en/includes/vanilla-key.inc
+++ /dev/null
@@ -1 +0,0 @@
-<br>
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/unido/en/includes/vanilla-left-nav.inc b/koha-tmpl/opac-tmpl/unido/en/includes/vanilla-left-nav.inc
deleted file mode 100644
index 2e568b6a7c..0000000000
--- a/koha-tmpl/opac-tmpl/unido/en/includes/vanilla-left-nav.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-<table border="0" cellpadding="0" cellspacing="0" width="100%">
-<tr valign="top"><td class="sidenav-box">
-
-
-
-
diff --git a/koha-tmpl/opac-tmpl/unido/en/includes/vanilla-logout.inc b/koha-tmpl/opac-tmpl/unido/en/includes/vanilla-logout.inc
deleted file mode 100644
index d8d2ebb5cf..0000000000
--- a/koha-tmpl/opac-tmpl/unido/en/includes/vanilla-logout.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-  <form>
-  
-<input type="submit" name="Log Out" value="Log Out" align="absmiddle" class="submit" />
-  </form>
diff --git a/koha-tmpl/opac-tmpl/unido/en/includes/vanilla-main.css b/koha-tmpl/opac-tmpl/unido/en/includes/vanilla-main.css
deleted file mode 100644
index b92308b4bf..0000000000
--- a/koha-tmpl/opac-tmpl/unido/en/includes/vanilla-main.css
+++ /dev/null
@@ -1,485 +0,0 @@
-/*
-What is
-*.search-number
-
-*/
-
-*.search-number {
-  border-bottom: 1px;
-  border-color: #354E27;
-
-  border-left: 1px;
-  border-right: 1px;
-  border-top: 1px;
-  display: inline;
-  font-family: verdana,arial,hevetica;
-  font-size: small;
-  font-weight: bold;
-  height: 17px;
-  padding: 2px;
-  text-decoration: none;
-  width: 17px;
-}
-
-*.selected-number {
-  background-color: #FEEDDB;
-  border-bottom: 1px;
-  border-color: #354E27;
-  border-left: 1px;
-  border-right: 1px;
-  border-style: solid;
-  border-top: 1px;
-  font-family: verdana,arial,hevetica;
-  font-size: small;
-  font-weight: bold;
-  height: 17px;
-  padding: 2px;
-  text-decoration: none;
-  width: 17px;
-}
-
-a {
-  color: #CC6600;
-  font-weight: bold;
-  
-}
-
-a:visited {
-  color: #3333CC;
-}
-
-a:hover {
-  color: #000000;
-  background-color: D6F96A;
-  
-  
-}
-
-a.button:hover {
-  background: transparent;
-  padding: 0;
-}
-
-body {
-  background-color: #FFFFFF;
-  font-family: verdana,arial,helvetica, san-serif;
-  margin: 0px;
-  padding: 0px;
-}
-
-h1 {
-  color: #663366;
-  font-family: arial,helvetica;
-  font-size: 180%;
-}
-
-.logo h1 {
-  margin-left: 20px;
-  margin-bottom: 4px;
-  margin-top: 4px;
-  color: #D3DFAD;}
-
-
-
-h2 {
-  color: #663366;
-  font-family: arial,helvetica;
-  font-size: 160%;
-  margin-bottom: 0px;
-  padding-bottom: 0px;
-}
-
-h3 {
-  color: #663366;
-  font-family: arial,helvetica;
-  font-size: 130%;
-  margin-bottom: 0px;
-  padding-bottom: 0px;
-}
-
-h4 {
-  color: #663366;
-  font-family: arial,helvetica;
-  font-size: 110%;
-  margin-bottom: 0px;
-  padding-bottom: 0px;
-}
-
-input {
-  font-family: monospace;
-  font-size: 12px;
-}
-
-input.checkbox {
-  font-family: monospace;
-  font-size: 25px;
-  height: 25px;
-  size: 25px;
-  width: 25px;
-}
-
-
-
-
-
-p,ul,ol,li {
-  font-family: verdana,arial,helvetica;
-  font-size: 12px;
-  line-height: 20px;
-}
-
-td {
-  font-family: verdana,arial,helvetica;
-  font-size: 12px;
-}
-
-.botnav a:link {
-  color: #41622F;
-  font-family: verdana,arial,helvetica;
-  font-size: 10pt;
-  font-weight: normal;
-}
-
-.botnav a:visited {
-  color: #909E88;
-  font-family: verdana,arial,helvetica;
-  font-size: 10pt;
-  font-weight: normal;
-}
-
-.botnav a:hover {
-  background-color: #D7E8A5;
-  color: #000000;
-}
-
-.brown-box {
-  background-color: #A88050;
-  border: 1px;
-  border-color: #000000;
-  border-style: solid;
-  color: #FEEDDB;
-  font-family: verdana,arial,hevetica;
-  font-size: small;
-  font-weight: bold;
-  padding: 4px;
-}
-
-.crumb {
-  color: #000000;
-  font-weight: normal;
-}
-
-.crumb a:link {
-  color: #CC9966;
-  font-weight: normal;
-}
-
-.crumb a:visited {
-  color: #666666;
-  font-weight: normal;
-}
-
-.crumb a:hover {
-  background-color: #D6F96A;
-  color: #000000;
-}
-
-.dk-brown{
-  background-color: #A2BB64; D7E8A5; 4E300C;
-}
-
-.fines-box {
-  background-color: #E3A46D;
-  border: 1px;
-  border-style: solid;
-  border-color: #4E300E;
-  
-  padding: 0px;
-}
-
-.green{
-  background-color: #E3A46D;
-}
-
-.green-box {
-  color: #FEEDDB;
-  background-color: #C57619;
-  border: 1px;
-  border-color: #000000;
-  border-style: solid;
-  font-family: verdana,arial,hevetica;
-  font-size: small;
-  font-weight: bold;
-  padding: 4px;
-}
-
-.head1 {
-  color: #663366;
-  font-family: arial,helvetica;
-  font-size: 180%;
-}
-
-.head1bold {
-  color: #663366;
-  font-family: arial,helvetica;
-  font-size: 180%;
-  font-weight: bold;
-}
-
-.head2{
-  color: #663366;
-  font-family: arial,helvetica;
-  font-size: 160%;
-  margin-bottom: 0px;
-  padding-bottom: 0px;
-}
-
-.head2bold {
-  color: #663366;
-  font-family: arial,helvetica;
-  font-size: 160%;
-  font-weight: bold;
-  margin-bottom: 0px;
-  padding-bottom: 0px;
-}
-
-.heading4 {
-  color: #663366;
-  font-family: arial,helvetica;
-  font-size: 110%;
-  font-weight: bold;
-  margin-bottom: 0px;
-  padding-bottom: 0px;
-}
-
-
-.label {
-  padding-right: 12px;
-  padding-bottom: 6px;
-
-}
-
-
-
-
-.line {
-  background-color: #663366; A2BB64; D7E8A5;
-}
-
-
-.opac-menu {
-  background-color: #663366;
-border-top: 0px;
-border-left: 0px;
-border-right: 0px;
-  border-bottom: 1px;
-  border-color: #000000;
-  border-style: solid;
-  margin: 0px;  
-}
-
-
-
-.main {
-  font-family: verdana,arial,helvetica;
-  font-size: 12px;
-}
-
-.menu {
-  margin-right: 10px;
-  color: #CCCC99;
-}
-
-
-.menu a:link {
-  color: #CCFF66;
-}
-
-.menu a:visited {
-  color: #E6E6CD;
-}
-
-.menu a:hover {
-  color: #000000;
-  background: EDF8CD;
-}
-
-
-.navhead {
-  font-weight: bold;
-  margin-top: 10px;
-  margin-bottom: 0px;
-}
-
-.navhead a:hover {
-  color: #000000;
-  background: ffffff;
-}
-
-
-.padded{
-  font-size: 12px;
-  line-height: 20px;
-  padding: 5px;
-
-}
-
-.pink{
-  background-color: #EDF8CD;
-  line-height: 20px;
-  margin-left: 5px;
-
-}
-
-.plain{
-  line-height: 20px;
-  margin-left: 5px;
-}
-
-.reset {
-  background-color: #A88050;
-  border: 1px;
-  border-color: #000000;
-  border-style: solid;
-  color: #FEEDDB;
-  font-family: verdana,arial,hevetica;
-  font-size: small;
-  font-weight: bold;
-  padding: 4px;
-}
-
-
-.search {
-  font-family: verdana,arial,hevetica;
-  font-size: 7.5pt;
-  font-weight: bold;
-}
-
-.selected{
-  color: #C96029;
-  font-weight: bold;
-  padding: 3px;
-}
-
-.selected-box {
-  background-color: #E3A46D;
-  padding: 0px;
-}
-
-.selected-lge{
-  color: #C96029;
-  font-family: arial,helvetica;
-  font-size: 120%;
-  font-weight: bold;
-  padding: 3px;
-}
-
-.shade{
-  background-color: #DCCAB4;
-  padding: 5px;
-}
-
-
-.shaded{
-  background-color: #EDF8CD;
-  padding: 5px;
-}
-
-
-
-.sidenav-box {
-  background-color: #C3DC76;
-  padding-left: 20px;  
-  padding-right: 4px;  
-  border-bottom: 1px;
-  border-top: 1px;
-  border-left: 0px;
-  border-right: 1px;
-  border-color: #A2BB64; 
-  border-style: solid;
-  
-  
-}
-
-.sidenav ul {
-  list-style-image: url(/images/styles/nav-dot.gif);
-  list-style-position: outside;
-  list-style-type: disc;
-  margin-left: 16px;
-  margin-top: 2px;
-  padding-left: 0px;
-  padding-top: 2px;
-
-  font-size: 9pt;
-  font-weight: normal;
-  line-height: 13px;
-  margin-bottom: 3pt;
-}
-
-
-.sidenav a:hover {
-  background: #ffffff;
-  color: #000000;
-}
-
-.small {
-  font-family: arial,helvetica;
-  font-size: 90%;
-  margin-bottom: 3pt;
-}
-
-.submit {
-  color: #FEEDDB;
-  background-color: #C57619;
-  border: 1px;
-  border-color: #000000;
-  border-style: solid;
-  font-family: verdana,arial,hevetica;
-  font-size: small;
-  font-weight: bold;
-  padding: 4px;
-}
-
-submit {
-  color: #FEEDDB;
-  background-color: #C57619;
-  border: 1px;
-  border-color: #000000;
-  border-style: solid;
-  font-family: verdana,arial,hevetica;
-  font-size: small;
-  font-weight: bold;
-  padding: 4px;
-}
-
-
-
-
-.table-heading {
-  background-color: #D7E8A5;
-  font-family: verdana,arial,hevetica;
-  font-size: small;
-  font-weight: bold;
-  padding: 5px;
-}
-
-.tan{
-  background-color: #A2BB64; D7E8A5;
-}
-
-.tiny {
-  font-family: arial,helvetica;
-  font-size: x-small;
-}
-
-.white-box {
-  background-color: #FFFFFF;
-  border-bottom: 1px;
-  border-left: 1px;
-  border-right: 1px;
-  border-top: 1px;
-  border-style: solid;
-border-color: #4E300E;
-  
-  padding: 0px;
-}
diff --git a/koha-tmpl/opac-tmpl/unido/en/includes/vanilla-member-menu.inc b/koha-tmpl/opac-tmpl/unido/en/includes/vanilla-member-menu.inc
deleted file mode 100644
index ef02985699..0000000000
--- a/koha-tmpl/opac-tmpl/unido/en/includes/vanilla-member-menu.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-<table class="opac-menu" width="100%" border=0>
-<TR class="opac-background">
-
-<td><div class="logo"><h1>UNIDO: Patrons</h1></div></td>
-
-
-<td align=right>
-<TMPL_INCLUDE name="vanilla-menu.inc"></td>
-</tr>
-
-
-</table>
-<p>
-
diff --git a/koha-tmpl/opac-tmpl/unido/en/includes/vanilla-membership-botnav.inc b/koha-tmpl/opac-tmpl/unido/en/includes/vanilla-membership-botnav.inc
deleted file mode 100644
index f4cdd26986..0000000000
--- a/koha-tmpl/opac-tmpl/unido/en/includes/vanilla-membership-botnav.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-<br />In this Section: | <a href="/cgi-bin/koha/opac-membership.pl">Membership</a> 
-| <a href="/cgi-bin/koha/opac-user.pl">My Account</a> 
-| <a href="/cgi-bin/koha/opac-readingrecord.pl">Reading Record</a> 
-| <a href="/cgi-bin/koha/opac-userdetails.pl">Personal Details</a> |<!--+Katipo+end--><br />&nbsp;</p>
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/unido/en/includes/vanilla-membership-left-nav.inc b/koha-tmpl/opac-tmpl/unido/en/includes/vanilla-membership-left-nav.inc
deleted file mode 100644
index f26b6afcaf..0000000000
--- a/koha-tmpl/opac-tmpl/unido/en/includes/vanilla-membership-left-nav.inc
+++ /dev/null
@@ -1,64 +0,0 @@
-<div class="navhead"><a href="/membership/">Membership</a></div>
-<div class="sidenav">
-
-<TMPL_IF NAME="loggedinuser">
-<ul>
-<li><a href="/cgi-bin/koha/opac-user.pl">My Home</a></li>
-
-<li><a href="/cgi-bin/koha/opac-account.pl">My Account</a></li>
-
-<li><a href="/cgi-bin/koha/opac-readingrecord.pl">Reading Record</a></li>
-
-<li><a href="/cgi-bin/koha/opac-userdetails.pl">Personal Details</a></li>
-</ul>
-
-<p>&nbsp;<p>
-<TMPL_LOOP NAME="USER_INFO">
-
-   <B> <TMPL_VAR NAME="firstname"> <TMPL_VAR NAME="surname"></B></br>
-
-<TMPL_IF NAME="emailaddress">
-
-    <A HREF='mailto:<TMPL_VAR NAME="emailaddress">'><TMPL_VAR NAME="emailaddress"></A></br>
-
-</TMPL_IF>
-<TMPL_IF NAME="streetaddress">
-    <TMPL_VAR NAME="streetaddress"></br>
-
-</TMPL_IF>
-<TMPL_IF NAME="suburb">
-    <TMPL_VAR NAME="suburb"></br>
-
-</TMPL_IF>
-<TMPL_IF NAME="city">
-    <TMPL_VAR NAME="city"></br>
-
-</TMPL_IF>
-<TMPL_IF NAME="phone">
-    <TMPL_VAR NAME="phone"></br>
-
-</TMPL_IF>
-</TMPL_LOOP>
-
- >><A HREF="/cgi-bin/koha/opac-userupdate.pl" class="sidenav">Edit Details</A>
-
-</div>
-
-<form action="/cgi-bin/koha/opac-main.pl" method="post">
-  <input type="hidden" name="logout.x" value="1">
-  <input type="submit" name="logout" value="logout" class="submit" />
-</form>
-
-<TMPL_ELSE>
-
-<form action="/cgi-bin/koha/opac-user.pl" method="post">
-  <div class="main">Members can sign in here:
-  <br />Cardnumber:
-  <br /><input type="text" name="userid" size="10" />
-  <br />Password:
-  <br /><input type="password" name="password" size="10" />&nbsp;&nbsp;
-  <input type="image" name="Go" src="<TMPL_VAR NAME='themelang'>/images/styles/home-go-button.gif" alt="Go" align="absmiddle" border="0" /></div>
-</form>
-
-
-</TMPL_IF>
diff --git a/koha-tmpl/opac-tmpl/unido/en/includes/vanilla-menu.inc b/koha-tmpl/opac-tmpl/unido/en/includes/vanilla-menu.inc
deleted file mode 100644
index 50e0bd1cd2..0000000000
--- a/koha-tmpl/opac-tmpl/unido/en/includes/vanilla-menu.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-<div class="menu"><a href="/cgi-bin/koha/opac-search.pl">Search</a>  |  
-<a href="/cgi-bin/koha/about.pl">About</a>  | 
-<a href="/cgi-bin/koha/contact.pl">Contact</a>  | 
-<a href="/cgi-bin/koha/opac-main.pl">Home</a>
-
-</div>
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/unido/en/includes/vanilla-personal-details.inc b/koha-tmpl/opac-tmpl/unido/en/includes/vanilla-personal-details.inc
deleted file mode 100644
index 35691231cc..0000000000
--- a/koha-tmpl/opac-tmpl/unido/en/includes/vanilla-personal-details.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="sidenav"><B> Finlay Thomson</B>
-<br>
-<A HREF="mailto:finlay@katipo.co.nz">finlay@katipo.co.nz</A>
-<br>123 Some St
-<br>York By
-<br>Eastbourne
-<br>Ph 123 4567
-<p>
-
->><A HREF="http://hlt-edit.katipo.co.nz/kaka/membership/account.html">Edit Details</A>
-</div>
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/unido/en/includes/vanilla-search-menu.inc b/koha-tmpl/opac-tmpl/unido/en/includes/vanilla-search-menu.inc
deleted file mode 100644
index f5f333ae96..0000000000
--- a/koha-tmpl/opac-tmpl/unido/en/includes/vanilla-search-menu.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-<table class="opac-menu" width="100%" border=0>
-<TR class="opac-background">
-
-<td><div class="logo"><h1>UNIDO: Catalogue Search</h1></div></td>
-
-
-<td align=right>
-<TMPL_INCLUDE name="vanilla-menu.inc"></td>
-</tr>
-
-
-</table>
-<p>
-
diff --git a/koha-tmpl/opac-tmpl/unido/en/opac-detail-all.tmpl b/koha-tmpl/opac-tmpl/unido/en/opac-detail-all.tmpl
deleted file mode 100644
index 8eafc851c3..0000000000
--- a/koha-tmpl/opac-tmpl/unido/en/opac-detail-all.tmpl
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//Dtd HTML 4.0 Transitional//EN"
-"http://www.w3.org/TR/REC-html40/loose.dtd">
-<!--
-design and HTML by rachel@katipo.co.nz, 
-templating by finlay@katipo.co.nz
-SEARCH RESULTS - ITEM DETAIL PAGE
-This is the part of the "vanilla" theme put together by Katipo
-Communications for general distribution with Koha. 
-If you see strange tags and comments you don't understand they may be out of
-Kea our content management system. If you'd like to use Kea to change your
-template & website text please contact Katipo.
-Cheers
-R
-12/1/03
--->
-<html>
-<head>
-<title>Details</title>
-<link rel="stylesheet" href="<TMPL_VAR
-NAME='themelang'>/includes/vanilla-main.css" type="text/css" />
-<script type="text/javascript" language="javascript">
-<TMPL_INCLUDE name="script.js">
-</script>
-</head>
-<body marginheight="0" marginwidth="0">
-
-<!--START TOP TABLE-->
-<TMPL_INCLUDE name="vanilla-search-menu.inc">
-<!--START MAIN TABLE AND LEFT NAVIGATION-->
-<TMPL_INCLUDE name="vanilla-left-nav.inc">
-<!--SEARCH FORM-->
-<TMPL_INCLUDE name="vanilla-cat-search.inc">
-<!--END LEFT NAV, START CRUMBS-->
-<TMPL_INCLUDE name="vanilla-crumb-start.inc">	
-<a href="/">Home</a> &gt;<a
-href='/cgi-bin/koha/opac-search.pl'>Searching</a> &gt;<a
-href='/cgi-bin/koha/opac-detail.pl?bib=<TMPL_VAR
-NAME="biblionumber">'>Details</a>
-<!--END CRUMBS-->
-<TMPL_INCLUDE name="vanilla-crumb-end.inc">
-<!--CONTENT--><p>
-
-<TMPL_LOOP NAME="BIBLIO_RESULTS">
-<table border="0" cellspacing="0" cellpadding="3">
-<tr valign="top"><td valign="top" class="head1bold" colspan="2"><TMPL_VAR NAME="title"><br />
-<TMPL_IF NAME="author"> (<TMPL_VAR NAME="author">)</TMPL_IF></td>
-<TMPL_UNLESS NAME="norequests">
-    <td><form action="/cgi-bin/koha/opac-reserve.pl" method="post">
-    <input type="submit" name="submit" value="Place Reserve" align="right" class="submit">
-    <input type="hidden" name="bib" value=<TMPL_VAR NAME="biblionumber">>
-    </form></td>
-</TMPL_UNLESS>
-</tr>
-</table>
-<p>
-<table border="0" cellspacing="0" cellpadding="0">
-<TMPL_IF NAME="abstract">
-<tr valign="top"><td valign="top" colspan="2"><div class="padded"><TMPL_VAR
-NAME="abstract">abstrac</div></td></tr>
-</TMPL_IF>
-<TMPL_IF NAME="url">
-<tr valign="top"><td><div class="padded"><b>Website:</b></div></td>
-    <td><div class="padded"><a href="<TMPL_VAR NAME="url">"><TMPL_VAR NAME="url"></a></div></td></tr>
-</TMPL_IF>
-<TMPL_IF NAME="subtitle">
-<tr valign="top"><td><div class="padded"><b>Subtitle:</b></div></td>
-    <td><div class="padded"><TMPL_VAR NAME="subtitle"></div></td></tr>
-</TMPL_IF>
-<TMPL_IF NAME="seriestitle">
-<tr valign="top"><td><div class="padded"><b>Series Title:</b></div></td>
-    <td><div class="padded"><TMPL_VAR NAME="seriestitle"></div.</td></tr>
-</TMPL_IF>
-<TMPL_IF NAME="conference">
-<tr valign="top"><td><div class="padded"><b>Conference Title:</b></div></td>
-    <td><div class="padded"><TMPL_VAR NAME="conference"></div</td></tr>
-</TMPL_IF>
-<TMPL_IF NAME="author">
-<tr valign="top"><td><div class="padded"><b>Author:</b></div></td>
-    <td><div class="padded"><TMPL_VAR NAME="author"></div></td></tr>
-</TMPL_IF>
-<TMPL_IF NAME="additional">
-<tr valign="top"><td><div class="padded"><b>Additional Author(s):</b></div></td>
-    <td><div class="padded"><TMPL_VAR NAME="additional"></div></td></tr>
-</TMPL_IF>
-</TMPL_LOOP>			
-<!--new-->
-<TMPL_LOOP NAME="ITEM_RESULTS">
-<TMPL_IF NAME="publishercode">
-<tr valign="top"><td><div class="padded"><b>Publisher:</b></div></td>
-    <td><div class="padded"><TMPL_VAR NAME="publishercode"></div></td></tr>
-</TMPL_IF>
-</TMPL_LOOP>
-<!--end new-->
-<TMPL_LOOP NAME="BIBLIO_RESULTS">
-<tr valign="top"><td><div class="padded"><b>Copyright:</b></div></td>
-    <td><div class="padded"><TMPL_VAR NAME="copyrightdate"></div></td></tr>
-<TMPL_IF NAME="language">
-<tr valign="top"><td><div class="padded"><b>Language:</b></div></td>
-    <td><div class="padded"><TMPL_VAR NAME="language"></div></td></tr>
-</TMPL_IF>
-<TMPL_IF NAME="subject">
-<tr valign="top"><td><div class="padded"><b>Subjects:</b></div></td>
-    <td><div class="padded"><TMPL_VAR NAME="subject"></div.</td></tr>
-</TMPL_IF>
-</TMPL_LOOP>					
-<!--new-->
-<TMPL_LOOP NAME="ITEM_RESULTS">
-<TMPL_IF NAME="itemtype">
-<tr valign="top"><td><div class="padded"><b>Type/Format:</b></div></td>
-    <td><div class="padded"><TMPL_VAR NAME="itemtype"></div></td></tr>
-</TMPL_IF>
-<TMPL_IF NAME="dewey">
-<tr valign="top"><td><div class="padded"><b>Classification:</b></div></td>
-    <td><div class="padded"><a href=/cgi-bin/koha/opac-searchresults.pl?dewey=<TMPL_VAR NAME="dewey" ESCAPE=URL>><TMPL_VAR NAME="dewey"></a></div></td></tr>
-</TMPL_IF>
-
-<TMPL_IF NAME="isbn">
-<tr valign="top"><td><div class="padded"><b>ISBN / ISSN:</b></div></td>
-    <td><div class="padded"><TMPL_VAR NAME="isbn"><TMPL_VAR NAME="issn"></div></td></tr>
-</TMPL_IF>
-<TMPL_IF NAME="issn">
-<tr valign="top"><td><div class="padded"><b>ISBN / ISSN:</b></div></td>
-    <td><div class="padded"><TMPL_VAR NAME="isbn"><TMPL_VAR NAME="issn"></div></td></tr>
-</TMPL_IF>
-<TMPL_IF NAME="volumeddesc">
-<tr valign="top"><td><div class="padded"><b>Volume:</b></div></td>
-    <td><div class="padded"><TMPL_VAR NAME="volumeddesc"></div></td></tr>
-</TMPL_IF>
-</TMPL_LOOP>
-<!--end new-->
-<TMPL_LOOP NAME="BIBLIO_RESULTS">    
-<TMPL_IF NAME="notes">
-<tr valign="top"><td><div class="padded"><b>Notes:</b></div></td>
-    <td><div class="padded"><TMPL_VAR NAME="notes"></div></td></tr>
-</TMPL_IF>
-<TMPL_IF NAME="holdings">
-<tr valign="top"><td><div class="padded"><b>Holdings:</b></div></td>
-    <td><div class="padded"><TMPL_VAR NAME="holdings"></div></td></tr>
-</TMPL_IF>
-<TMPL_IF NAME="frequency">
-<tr valign="top"><td><div class="padded"><b>Frequency:</b></div></td>
-    <td><div class="padded"><TMPL_VAR NAME="frequency"></div></td></tr>
-</TMPL_IF>
-</TMPL_LOOP>
-
-<!--new-->
-<TMPL_LOOP NAME="ITEM_RESULTS">
-<tr><td class="line" colspan="2"><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width="1" height="1" border="0" alt=""></td></tr>
-<tr><td><div class="padded"><b>Barcode:</b></div></td>
-    <td><div class="padded"><TMPL_VAR NAME="barcode"></div></td></tr>
-<tr><td><div class="padded"><b>Status:</b></div></td>
-    <td><table cellpadding="0" cellspacing="0"><tr><td><td
-style="background-color:#EDF8CD;border solid 1px #DAE4C1"><div
-class="padded"><TMPL_VAR NAME="datedue"></div></td></tr></table></td>
-<tr><td><div class="padded"><b>Location:</b></div></td>
-    <td><div class="padded"><TMPL_VAR NAME="branchname"></div></td></tr>
-</TMPL_LOOP>
-</table>
-<!--end new-->
-
-			
-<!--BOTTOM NAVIGATION - ALL-->
-<TMPL_INCLUDE name="vanilla-botnav-all.inc">
-<!--BOTTOM NAVIGATION - SECTION-->
-			
-<!--END MAIN TABLE-->
-<TMPL_INCLUDE name="vanilla-end-main.inc">
-</body>
-</html>
diff --git a/koha-tmpl/opac-tmpl/unido/en/opac-detail-multi.tmpl b/koha-tmpl/opac-tmpl/unido/en/opac-detail-multi.tmpl
deleted file mode 100644
index f2b51c52e5..0000000000
--- a/koha-tmpl/opac-tmpl/unido/en/opac-detail-multi.tmpl
+++ /dev/null
@@ -1,101 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//Dtd HTML 4.0 Transitional//EN"
-"http://www.w3.org/TR/REC-html40/loose.dtd">
-<!--
-design and HTML by rachel@katipo.co.nz, 
-templating by finlay@katipo.co.nz
-SEARCH RESULTS - ITEM DETAIL PAGE
-This is the part of the "vanilla" theme put together by Katipo
-Communications for general distribution with Koha. 
-If you see strange tags and comments you don't understand they may be out of
-Kea our content management system. If you'd like to use Kea to change your
-template & website text please contact Katipo.
-Cheers
-R
-12/1/03
--->
-<html>
-<head>
-<title>Details</title>
-<link rel="stylesheet" href="<TMPL_VAR
-NAME='themelang'>/includes/vanilla-main.css" type="text/css" />
-<script type="text/javascript" language="javascript">
-<TMPL_INCLUDE name="script.js">
-</script>
-</head>
-<body marginheight="0" marginwidth="0">
-
-<!--START TOP TABLE-->
-<TMPL_INCLUDE name="vanilla-search-menu.inc">
-<!--START MAIN TABLE AND LEFT NAVIGATION-->
-<TMPL_INCLUDE name="vanilla-left-nav.inc">
-<!--SEARCH FORM-->
-<TMPL_INCLUDE name="vanilla-cat-search.inc">
-<!--END LEFT NAV, START CRUMBS-->
-<TMPL_INCLUDE name="vanilla-crumb-start.inc">	
-<a href="/">Home</a> &gt;<a
-href='/cgi-bin/koha/opac-search.pl'>Searching</a> &gt;<a
-href='/cgi-bin/koha/opac-detail.pl?bib=<TMPL_VAR
-NAME="biblionumber">'>Details</a>
-<!--END CRUMBS-->
-<TMPL_INCLUDE name="vanilla-crumb-end.inc">
-<!--CONTENT--><p>
-
-<TMPL_LOOP NAME="BIBLIO_RESULTS">
-<table border="0" cellspacing="0" cellpadding="3">
-<tr valign="top"><td valign="top" class="head1bold" colspan="2"><TMPL_VAR
-NAME="title"><br />
-<TMPL_IF NAME="author"> (<TMPL_VAR NAME="author">)</TMPL_IF></td>
-    <td>
-<TMPL_UNLESS NAME="norequests">
-    <form action="/cgi-bin/koha/opac-reserve.pl" method="post">
-    <input type="submit" name="submit" value="Place Reserve" align="right" class="submit">
-    <input type="hidden" name="bib" value=<TMPL_VAR NAME="biblionumber">>
-    </form>
-</TMPL_UNLESS>
-    </td></tr>
-</table>
-</TMPL_LOOP>
-<p style="font-size:110%;font-style:italic">There are multiple copies of
-this title with different catalogue information. Click on an item to see its full record.</p>
-
-<table border="0" cellspacing="0" cellpadding="3">
-<TMPL_LOOP NAME="ITEM_RESULTS">
-
-<tr valign="top"><td> &nbsp; </td>
-    <td><div class="padded">
-
-     <a href="/cgi-bin/koha/opac-detail.pl?bib=<TMPL_VAR
-NAME="biblionumber">&bibitem=<TMPL_VAR NAME="biblioitemnumber">"><TMPL_IF NAME="volumeddesc">
-  Volume: <TMPL_VAR NAME="volumeddesc">
-<TMPL_ELSE>
-  <TMPL_IF NAME="isbn">
-    <TMPL_VAR NAME="isbn">
-  <TMPL_ELSE>
-    <TMPL_IF NAME="issn">
-      <TMPL_VAR NAME="issn">
-    </TMPL_IF>
-  </TMPL_IF>
-</TMPL_IF>
-</a>     
-    </div></td>
-    <td><div class="padded">
-		   
-    <a href="/cgi-bin/koha/opac-detail.pl?bib=<TMPL_VAR
-NAME="biblionumber">&bibitem=<TMPL_VAR NAME="biblioitemnumber">"><TMPL_VAR NAME="description"></a>
-
-    </div></td></tr>
-</TMPL_LOOP>
-<table>
-      
-
-      
-      
-      
-<!--BOTTOM NAVIGATION - ALL-->
-<TMPL_INCLUDE name="vanilla-botnav-all.inc">
-<!--BOTTOM NAVIGATION - SECTION-->
-      
-<!--END MAIN TABLE-->
-<TMPL_INCLUDE name="vanilla-end-main.inc">
-</body>
-</html>
diff --git a/koha-tmpl/opac-tmpl/unido/en/opac-detail.tmpl b/koha-tmpl/opac-tmpl/unido/en/opac-detail.tmpl
deleted file mode 100644
index 9e32be8ae2..0000000000
--- a/koha-tmpl/opac-tmpl/unido/en/opac-detail.tmpl
+++ /dev/null
@@ -1,208 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<!--
-
-design and HTML by rachel@katipo.co.nz, 
-templating by finlay@katipo.co.nz
-
-SEARCH RESULTS - ITEM DETAIL PAGE
-
-This is the part of the "vanilla" theme put together by Katipo Communications for general distribution with Koha. 
-
-
-If you see strange tags and comments you don't understand they may be out of Kea our content management system. If you'd like to use Kea to change your template & website text please contact Katipo.
-
-Cheers
-R
-
-12/1/03
-
--->
-
-<html>
-<head>
-<title>Details</title>
-<link rel="stylesheet" href="<TMPL_VAR NAME='themelang'>/includes/vanilla-main.css" type="text/css" />
-<script type="text/javascript" language="javascript">
-<TMPL_INCLUDE name="script.js">
-</script>
-</head>
-<body marginheight="0" marginwidth="0">
-
-<!--START TOP TABLE-->
-<TMPL_INCLUDE name="vanilla-search-menu.inc">
-<!--START MAIN TABLE AND LEFT NAVIGATION-->
-<TMPL_INCLUDE name="vanilla-left-nav.inc">
-<!--SEARCH FORM-->
-<TMPL_INCLUDE name="vanilla-cat-search.inc">
-<!--END LEFT NAV, START CRUMBS-->
-<TMPL_INCLUDE name="vanilla-crumb-start.inc">	
-<a href="/">Home</a> &gt;<a href='/cgi-bin/koha/opac-search.pl'>Searching</a> &gt;<a href='/cgi-bin/koha/opac-detail.pl?bib=<TMPL_VAR NAME="biblionumber">'>Details</a>
-<!--END CRUMBS-->
-<TMPL_INCLUDE name="vanilla-crumb-end.inc">
-<!--CONTENT--><P>
-
-<TMPL_LOOP NAME="BIBLIO_RESULTS">
-<table border="0" cellspacing="0" cellpadding="3"><tr><td valign="top">
-<table border="0" cellspacing="0" cellpadding="3"><tr>
-<td valign="top" class="head1bold" colspan=2><TMPL_VAR NAME="title"><br/>
-<TMPL_IF NAME="author"> (<TMPL_VAR NAME="author">)</TMPL_IF></td>
-</tr>
-</table>
-<P><table border="0" cellspacing="0" cellpadding="2">
-<TMPL_IF NAME="abstract">
-  <tr> 
-
-    <TD VALIGN="TOP" colspan=2><TMPL_VAR NAME="abstract"></td>
-    
-  </tr>
-</TMPL_IF>  
-<TMPL_IF NAME="url">
-  <tr> 
-    <td VALIGN="TOP"><B>Website:</B> </TD>
-    <TD VALIGN="TOP"><a href="<TMPL_VAR NAME="url">"><TMPL_VAR NAME="url"></a</td>
-  </tr>
-</TMPL_IF>
-<TMPL_IF NAME="subtitle">
-  <tr> 
-    <td VALIGN="TOP"><B>Subtitle:</B> </TD>
-    <TD VALIGN="TOP"><TMPL_VAR NAME="subtitle"></td>
-  </tr>
-</TMPL_IF>
-<TMPL_IF NAME="seriestitle">
-  <tr> 
-    <td VALIGN="TOP"><B>Series Title:</B> </TD>
-    <TD VALIGN="TOP"><TMPL_VAR NAME="seriestitle"></td>
-  </tr>
-</TMPL_IF>
-<TMPL_IF NAME="conference">
-  <tr> 
-    <td VALIGN="TOP"><B>Conference Title:</B> </TD>
-    <TD VALIGN="TOP"><TMPL_VAR NAME="conference"></td>
-  </tr>
-</TMPL_IF>
-<TMPL_IF NAME="author">
-  <tr> 
-    <td VALIGN="TOP"><B>Author:</B> </TD>
-    <TD VALIGN="TOP"><TMPL_VAR NAME="author"></td>
-  </tr>
-</TMPL_IF>
-<TMPL_IF NAME="additional">
-  <tr> 
-    <td VALIGN="TOP"><B>Additional Author(s):</B> </TD>
-    <TD VALIGN="TOP"><TMPL_VAR NAME="additional"></td>
-  </tr>
-</TMPL_IF>
-
-
-  <tr>
-    <td VALIGN="TOP"><B>Copyright:</B> </TD>
-    <TD VALIGN="TOP"><TMPL_VAR NAME="copyrightdate"></td>
-  </tr>
-  <TMPL_IF NAME="language">
-  <tr> 
-    <td VALIGN="TOP"><B>Language:</B> </TD>
-    <TD VALIGN="TOP"><TMPL_VAR NAME="language"></td>
-  </tr>
-</TMPL_IF>
-
-  
-  <TMPL_IF NAME="subject">
-  <tr>
-    <td VALIGN="TOP"><B>Subjects:</B> </TD>
-    <TD VALIGN="TOP"><TMPL_VAR NAME="subject"></td>
-  </tr>
-  </TMPL_IF>
-<TMPL_IF NAME="notes">
-  <tr> 
-    <td VALIGN="TOP"><B>Notes:</B> </TD>
-    <TD VALIGN="TOP"><TMPL_VAR NAME="notes"></td>
-  </tr>
-</TMPL_IF>
-
-<TMPL_IF NAME="holdings">
-  <tr> 
-    <td VALIGN="TOP"><B>Holdings:</B> </TD>
-    <TD VALIGN="TOP"><TMPL_VAR NAME="holdings"></td>
-  </tr>
-</TMPL_IF>
-
-</table>
-</td>
-<TMPL_UNLESS NAME="norequests">
-<TD valign="top">
-    <form action="/cgi-bin/koha/opac-reserve.pl" method=post>
-    <INPUT TYPE="submit" name="submit"  VALUE="Place Reserve" align=right class="submit">
-    <input type=hidden name=bib value=<TMPL_VAR NAME="biblionumber">>
-    </form>
-</TD>
-</TMPL_UNLESS>
-</tr></table>
-</TMPL_LOOP>
-<P>
-
-<H2>Copies Information</H2>
-<table border=0 cellspacing=0 cellpadding=0>
-<!--HOLDINGS INFORMATION HEADER TABLE ROWS-->
-<tr><td colspan="14" ><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="10" BORDER="0" ALT=""></td></tr>
-<tr><TD>&nbsp;</TD>
-<td valign="top"><div class="padded"><B>Type/Format</B></div></td>
-<td class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td>
-
-<td valign="top" ><div class="padded"><B>Class</B></div></td>
-
-<td class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td>
-
-<td valign="top"><div class="padded"><B>Location</B></div></td>
-
-<td class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td>
-
-<td valign="top" ><div class="padded"><B>Availability</B></div></td>
-
-
-
-<td class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td>
-
-
-<td valign="top" ><div class="padded"><B>ISBN / ISSN</B></div></td>
-<td class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td>
-
-
-<td valign="top" ><div class="padded"><B>Volume</B></div></td>
-<td class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td>
-
-
-<td valign="top" ><div class="padded"><B>Barcode</B></div></td></tr>
-<!--LINE-->
-<tr><td colspan="14" class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td></tr>
-
-<TMPL_LOOP NAME="ITEM_RESULTS">
-<!--INFORMATION ROWS-->
-<tr><td valign="top"><TMPL_INCLUDE NAME="itemtype-image.inc"></td>
-<td valign="top"><div class="padded"><TMPL_VAR NAME="description"></div></td>
-<td class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td>
-<td valign="top"><div class="padded"><a href=/cgi-bin/koha/opac-searchresults.pl?dewey=<TMPL_VAR NAME="dewey" ESCAPE=URL>><TMPL_VAR NAME="class"></a></div></td>
-<td class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td>
-<td valign="top"><div class="padded"><TMPL_VAR NAME="branchname"></div></td>
-<td class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td>
-<td valign="top"><div class="padded"><TMPL_VAR NAME="datedue"></div></td>
-<td class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td>
-<td valign="top"><div class="padded"><TMPL_VAR NAME="isbn"><TMPL_VAR NAME="issn"></div></td>
-<td class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td>
-<td valign="top"><div class="padded"><TMPL_VAR NAME="volumeddesc"></div></td>
-<td class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td>
-<td valign="top"><div class="padded"><TMPL_VAR NAME="barcode"></div></td></tr>
-</TMPL_LOOP>
-
-</table>
-<P>
-
-<!--+Katipo+end-->
-<!--BOTTOM NAVIGATION - ALL-->
-<TMPL_INCLUDE name="vanilla-botnav-all.inc">
-<!--BOTTOM NAVIGATION - SECTION-->
-
-<!--END MAIN TABLE-->
-<TMPL_INCLUDE name="vanilla-end-main.inc">
-</body>
-</html>
-
diff --git a/koha-tmpl/opac-tmpl/unido/en/opac-main.tmpl b/koha-tmpl/opac-tmpl/unido/en/opac-main.tmpl
deleted file mode 100644
index a6eb34373e..0000000000
--- a/koha-tmpl/opac-tmpl/unido/en/opac-main.tmpl
+++ /dev/null
@@ -1,140 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-
-
-<html>
-<title>WELCOME TO THE  UNIDO OPAC (Online Public Access Catalogue) </title>
-<style type="text/css">
-
-<!--
-
-@import url(<TMPL_VAR NAME='themelang'>/includes/css/home-modern.css);
-
-input {
-font-size: 16px;
-height: 28px;      }
-
-
-.search {
-height: 28px;      }
-
-.search-heading {
-  font-family: arial, helvetica, sans-serif;
-  font-size: 18px;
-  font-weight: normal;
-}
-
-
-
-h1 {
-  font-family: ocean sans, garamond, times, serif;
-  font-size: 48px;
-  font-weight: normal;
-  font-style: italic;
-
-  }
-  
-.menu {
-  font-family: arial, helvetica, sans-serif;
-  font-size: 12px;
-  font-weight: bold;
-  margin-left: 65px;
-  }
-  
-  
-  .credit {
-  font-family: arial, helvetica, sans-serif;
-  font-size: 9px;
-  font-weight: bold;
-  margin-left: 14px;
-  margin-top: 64px;
-  }
-  
-
-.ok  {
- height: 32px;
-width: 40px;
-  background-color: #d59b61;
-  font-family: arial, helvetica, sans-serif;
-  font-size: 16px;
-  font-weight: bold;
-  text-align: center;
-  border: 1px;
-  border-color: #000000;
-  border-style: solid;
-  padding: 0px;
- 
-}
-
--->
-
-</style>
-
-</head>
-
-<body onload="document.catsearch.keyword.focus()"
-BGCOLOR="#FF9933" 
-text="black" 
-link="#0066FF" 
-vlink="#0066FF" 
-alink="#000000" 
-leftmargin=0 
-topmargin=0
-marginheight=0
-marginwidth=0 >
-
-
-<table cellspacing=0 cellpadding=0 border=0 align="center">
-<tr valign=top >
-<td>
-
-<img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=198 height=44  alt=" " hspace=0 vspace=0>
-</td>
-
-<td colspan="3">
-
-<img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=198 height=44  alt=" " hspace=0 vspace=0>
-</td>
-<td>
-
-<img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=198 height=44  alt=" " hspace=0 vspace=0>
-</td>
-</tr>
-
-<tr valign=top >
-<td width=198 height=136 align="right">
-<img src="<TMPL_VAR NAME='themelang'>/images/unido-logo.gif" width=43 height=42 
-alt="UNIDO Logo " hspace=0 vspace=0>
-</td>
-<td colspan="3"><h1>Welcome to the<br>
- UNIDO Library</h1>
- </td></tr>
-
-
-<tr>
-<td align="right" rowspan="2"  valign=bottom ><img src="<TMPL_VAR NAME='themelang'>/images/unido-home-photos.jpg" width="198" height="198" border="0" alt="Photos of Wellington">
-<td>
-<form ACTION="/cgi-bin/koha/opac-searchresults.pl" name=catsearch>
-<input type=hidden name=type value=opac>
-<span class="search-heading">Search</span></td>
-
-<td><input type=text size="24" name="keyword" class="search"> <input type="submit" value="OK" class="ok">
-</form></td>
-
-
-
-</tr>
-<tr><td colspan=3>
-<div class="menu"><a href="/cgi-bin/koha/opac-search.pl">More Search Options</a> | <a href="/cgi-bin/koha/about.pl">About</a> | <a href="/cgi-bin/koha/contact.pl">Contact</a>  </div>
-<p> &nbsp; </p>
-<div class="credit">
-For more information on the koha library system<br> 
-visit  <b><a href="http://www.koha.org">www.koha.org</a></b>
-</div>
-</td>
-
-</tr>
-
-</table>
-
-
-</html>
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/unido/en/opac-search.tmpl b/koha-tmpl/opac-tmpl/unido/en/opac-search.tmpl
deleted file mode 100644
index 5275f3f424..0000000000
--- a/koha-tmpl/opac-tmpl/unido/en/opac-search.tmpl
+++ /dev/null
@@ -1,100 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<html>
-<!--
-design and HTML by rachel@katipo.co.nz, 
-templating by finlay@katipo.co.nz
-SEARCH
-This is the part of the "vanilla" theme put together by Katipo Communications for general distribution with Koha. 
-Add links to other searches etc to this page.
-If you don't wish people to search by these fields, or want to add others then this is the place to do it.
-If you see strange tags and comments you don't understand they may be out of Kea our content management system. If you'd like to use Kea to change your template & website text please contact Katipo.
-Cheers
-R
-12/1/03
--->
-<html>
-<head>
-<title>Search The Catalogue</title>
-<link rel="stylesheet" href="<TMPL_VAR name='themelang'>/includes/vanilla-main.css" type="text/css" />
-<script type="text/javascript" language="javascript">
-// <TMPL_INCLUDE name="script.js">
-</script>
-<script type="text/javascript" language="javascript">
-<!--
-function Start(page) {
-OpenWin = this.open(page,
-"CtrlWindow","toolbar=yes,scrollbars=yes,resizable=yes,width=430,height=330,left=130,top=100");
-}
-// -->
-</script>
-</head>
-<body marginheight="0" marginwidth="0">
-
-<!--START TOP table-->
-<TMPL_INCLUDE name="vanilla-search-menu.inc">
-
-<!--START MAIN table AND LEFT NAVIGATION-->
-<TMPL_INCLUDE name="vanilla-left-nav.inc">
-
-<!--SEARCH form-->
-<TMPL_INCLUDE name="vanilla-cat-search.inc">
-<!--END LEFT NAV, START CRUMBS-->
-<TMPL_INCLUDE name="vanilla-crumb-start.inc">	
-<a href="/">Home</a> &gt;<a href='/cgi-bin/koha/opac-search.pl'>Search</a>
-<!--END CRUMBS-->
-<TMPL_INCLUDE name="vanilla-crumb-end.inc">
-<!--CONTENT-->
-
-<h1>Search the Catalogue</h1>
-<form action="/cgi-bin/koha/opac-searchresults.pl" method="post">
-<table cellpadding="0" cellspacing="5" border="0">
-<tr valign="top"><td><a href="javascript:Start('<TMPL_VAR NAME="site">/help/title.html')">Title</a></td>
-    <td><input type="text" size="25" name="title"></td>
-    <td><input type="radio" name="ttype" value="normal" checked><a
-href="javascript:Start('<TMPL_VAR NAME="site">/help/normal-exact.html')">Normal</a><input
-type="radio" name="ttype" value="exact"><a href="javascript:Start('<TMPL_VAR
-NAME="site">/help/normal-exact.html')">Exact</a></td></tr>
-<tr valign="top"><td><a href="javascript:Start('<TMPL_VAR NAME="site">/help/author.html')">Author</a></td>
-    <td><input type="text" size="25" name="author"></td></tr>
-<tr valign="top"><td><a href="javascript:Start('<TMPL_VAR NAME="site">/help/keywords.html')">Keywords</a></td>
-    <td><input type="text" size="25" name="keyword"></td></tr>
-<tr valign="top"><td><a href="javascript:Start('<TMPL_VAR NAME="site">/help/typeofitem.html')">Type of Item</a></td>
-    <td><select size="1" name="class">
-    <option value="">Any
-    <!-- fetch class list -->
-    <TMPL_VAR name="classlist">
-</select></td></tr>
-<tr><td><a href="javascript:Start('<TMPL_VAR NAME="site">/help/language.html')">Language</a></td><td>
-    <select name="language">
-    <option value="" selected>Any</option>
-    </select></td></tr>
-<tr><td><a href="javascript:Start('<TMPL_VAR NAME="site">/help/published.html')">Published After (Year)</a></td>
-    <td><input type="text" name="date-after"></td></tr>
-<tr><td><a href="javascript:Start('<TMPL_VAR NAME="site">/help/published.html')">Published Before (Year)</a></td>
-    <td><input type="text" name="date-before"></td></tr>
-<tr><td><a href="javascript:Start('<TMPL_VAR NAME="site">/help/dewey.html')">Dewey/UDC number</a></td>
-    <td><input type="text" name="dewey"></td></tr>
-<tr valign="top"><td></td>
-    <td><input type="submit" value="OK Start Search" size="15" class="submit"></td></tr>
-<tr valign="top"><td colspan="3"><img src="<TMPL_VAR name='themelang'>/images/holder.gif" width="10" height="5" border="0" alt=""></td></tr>
-<tr valign="top"><td colspan="3"><h3>Search by List of Subjects</h3></td></tr>
-<tr valign="top"><td><a href="javascript:Start('<TMPL_VAR NAME="site">/help/subject.html')">Subject</a></td>
-    <td><input type="text" size="25" name="subject"></td>
-    <td><input type="submit" value="OK" size="2" class="submit"><img src="<TMPL_VAR name='themelang'>/images/holder.gif" width="10" height="5" border="0" align="right" alt=""></td></tr>
-<tr valign="top"><td colspan="3"><img src="<TMPL_VAR name='themelang'>/images/holder.gif" width="10" height="5" border="0" alt=""></td></tr>
-<tr valign="top"><td><h3>Search for ISBN / ISSN</h3></td></tr>
-<tr valign="top"><td><a href="javascript:Start('<TMPL_VAR NAME="site">/help/isbn.html')">ISBN/ISSN</a></td>
-    <td><input type="text" size="25" name="isbn"></td>
-    <td><input type="submit" value="OK" size="2" class="green-box"><img src="<TMPL_VAR name='themelang'>/images/holder.gif" width="10" height="5" border="0" align="right" alt=""></td></tr>
-<tr valign="top"><td></td>
-    <td><font size="4" face="arial,helvetica"><input type="reset" value="Reset" size="10" class="reset"></font></td></tr>
-</table>
-</form>
-
-<!--BOTTOM NAVIGATION - ALL-->
-<TMPL_INCLUDE name="vanilla-botnav-all.inc">
-
-<!--END MAIN table-->
-<TMPL_INCLUDE name="vanilla-end-main.inc">
-</body>
-</html>
diff --git a/koha-tmpl/opac-tmpl/vanilla/en/images/book.gif b/koha-tmpl/opac-tmpl/vanilla/en/images/book.gif
deleted file mode 100644
index c823fdcfd65e9c13141b11989c04b0b79a48e207..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1971
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
F06Wdm<NN>s

diff --git a/koha-tmpl/opac-tmpl/vanilla/en/images/circle.gif b/koha-tmpl/opac-tmpl/vanilla/en/images/circle.gif
deleted file mode 100644
index e60cc7f849a1de4e9b23eba363e9fffe8a690c6f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1006
zcmV<K0}=d3Nk%w1VH5xq0Qdg@0RR9K5f2m>AR-(h872`TARinfE+Z*4P9Fs=D>64L
zBP2H%DK9%RFe)%GF)27AC_fxcFbpy_KrBTdaw!BoJU&M{GdVv;G)*KtM>IH5C`Cm@
zVn8E2RW3(LP*zGpL0L0TPEeUQ2ToB|LSZdUSVdJ;Rg^&&UQ|g;V?K6MF<4q(S7A|T
zT25bGU|wNiWM(;6Ye`~dP`yP6hE-2$WLSt?GiGIFePBkUQzuz<MO|@GW^Ph>Wm;!z
zagJj^bZlgBY;T%dT4s4yZE|yeb3=4^U3YYBYJOswZAqkLWwmBK%3&sZdU|$ygLZ~!
ziF<ODeo&=&P>p_lfrEpHg?XuYZGw((s)A99ii(GelcI%i(RM_dh<k;TdY6rak&uzK
ziCKu2nUa`!jG2X(n1{EHbefu($c|m5n2eL2qMe|CnxToKotvSflcl4Iq@$g!p_R#&
zhrOSBoTsbPm}jk}oTjRlqOO{^r;MtqsjjP_-JWLJpK7kIlBKV+xvP}hn~<uqp2ew&
zu&%DuqK&w&qvND)%BZ8rtd-lJr>wTM#<7pIw6m_cs_3V3*{GMgx1PDSsJOPeytcB*
zw4AlOv9rCrvb@E*y1L`7kld}Lyu7l<x~JK+oX5Sg(z~R+#ka`Bth>g@*}JsG#l-2j
zs>sN<#K+6g#kI`G!`H^H%g4*b%)-{ky4=RH#m&vc&DHC|r_9X8-o?Ju%)8CdyVuXQ
z-^;eo&(6)$$=A=t-_O0-)4%J<#Ld>#)YQ_~)XMM8y64Z&`N_Z5*Vy9K!`#=@>D9m1
z-PY#U%hcW6+}zjY+r{nH&DY-J=G@Hd+sNPF-}c$g-s9Wr-_!2j%=OyV+~wuu<m2t*
z(DUQZ;^*q;=jZO`-1X+u<?Q6-?CtpH*Y@Y$>+9<L<=pn`*7NM%=kN6U>(}q^@BQuC
z^zZ5H^z8rd+wArC{PW=Y^X>KZ_4N1s`}g(r`}Oku{rdX<{rmO%`}_a<`}+U-`v3p`
z|N8&`{{R30A^8LW00930EC2ui02BZe000Qf0R0IZD6k(vg8T*=6qrz+x^CUn(K|@d
zpS(|Bim1Q=B~7r275yFS(nXTAeDaRv>Bz34GAM=?`di2@O_z8F<#ma9FrhzuUjWS<
z_^As$pB249$wu%?r+)fE_RE(>=)fY<6o%{sg<y-QAqT3$p%4eiu>MpPAqXWHT7UWs
zbx~OL?Y=IQ2nK^f4(%=|?D#FzmnIEZir}_<qIm907jO9p&ie~UU&4Me;{oa@$(1U(
cP(C58NDa`I9!0uziZ?hczkP3GhYSb+JN!2}=l}o!

diff --git a/koha-tmpl/opac-tmpl/vanilla/en/images/disk.gif b/koha-tmpl/opac-tmpl/vanilla/en/images/disk.gif
deleted file mode 100644
index 0cc1b7d899a1114f19ecb604d241c975713a8800..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1693
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

diff --git a/koha-tmpl/opac-tmpl/vanilla/en/images/dk-brown-dot.gif b/koha-tmpl/opac-tmpl/vanilla/en/images/dk-brown-dot.gif
deleted file mode 100644
index 10ce19bdd318205527e48fb896b6f3998a621bfb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 43
scmZ?wbhEHbWMp7uXkcLQGvHxhU{L(Y0wft2bU*}1hJlI6g^|G;0D;g1g#Z8m

diff --git a/koha-tmpl/opac-tmpl/vanilla/en/images/dvd.gif b/koha-tmpl/opac-tmpl/vanilla/en/images/dvd.gif
deleted file mode 100644
index 07fec61ea6afb7c883e5dc1ad70715c92b753154..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2393
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
L&8~JO5)c48>VG@7

diff --git a/koha-tmpl/opac-tmpl/vanilla/en/images/fine.gif b/koha-tmpl/opac-tmpl/vanilla/en/images/fine.gif
deleted file mode 100644
index 25234f3c026cf8d19e629852f93caab05b1b1f0d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1498
zcmV<01tt1NNk%w1VK@Lc0Qdg@0RR9K5f2m>AR-(h872`TARinfE+Z*4P9Fs=D>64L
zBP2H%DK9%RFe)%GF)27AC_fxcFbpy_KrBTdaw!BoJU&M{GdVv;G)*KtM>IH5C`Cm@
zVn8E2RW3(LP*zGpL0L0TPEeUQ2ToB|LSZdUSVdJ;Rg^&&UQ|g;V?K6MF<4q(S7A|T
zT25bGU|wNiWM(;6Ye`~dP`yP6hE-2$WLSt?GiGIFePBkUQzuz<MO|@GW^Ph>Wm;!z
zagJj^bZlgBY;T%dT4s4yZE|yeb3=4^U3YYBYJOswZAqkLWwmBK%3&sZdU|$ygLZ~!
ziF<ODeo&=&P>p_lfrEpHg?XuYZGw((s)A99ii(GelcI%i(RM_dh<k;TdY6rak&uzK
ziCKu2nUa`!jG2X(n1{EHbefu($c|m5n2eL2qMe|CnxToKotvSflcl4Iq@$g!p_R#&
zhrOSBoTsbPm}jk}oTjRlqOO{^r;MtqsjjP_-JWLJpK7kIlBKV+xvP}hn~<uqp2ew&
zu&%DuqK&w&qvND)%BZ8rtd-lJr>wTM#<7pIw6m_cs_3V3*{GMgx1PDSsJOPeytcB*
zw4AlOv9rCrvb@E*y1L`7kld}Lyu7l<x~JK+oX5Sg(z~R+#ka`Bth>g@*}JsG#l-2j
zs>sN<#K+6g#kI`G!`H^H%g4*b%)-{ky4=RH#m&vc&DHC|r_9X8-o?Ju%)8CdyVuXQ
z-^;eo&(6)$$=A=t-_O0-)4%J<#Ld>#)YQ_~)XMM8y64Z&`N_Z5*Vy9K!`#=@>D9m1
z-PY#U%hcW6+}zjY+r{nH&DY-J=G@Hd+sNPF-}c$g-s9Wr-_!2j%=OyV+~wuu<m2t*
z(DUQZ;^*q;=jZO`-1X+u<?Q6-?CtpH*Y@Y$>+9<L<=pn`*7NM%=kN6U>(}q^@BQuC
z^zZ5H^z8rd+wArC{PW=Y^X>KZ_4N1s`}g(r`}Oku{rdX<{rmO%`}_a<`}+U-`v3p`
z|N8&`{{R30A^8LW00930EC2ui05||Q000R803!$-NU)&6g9sBU6gZ=y!-o(fN}NcM
zBEyOpGisE0abra$Ts&gzC{m&@StTt-NGTCbI$<n1u8jF`+PZW!A(D*ACEdDpB1GhD
zxRa%<pX-(c6-u*cNi;~41|90uBNJgr)8R5BWopc-AM2Rfmd<C^pW8xyow<?AQJ-d`
z$_=x2Ba@?Yf4a+yb_q+c51DLRw|6gJzOqiF1l*8`&BKt9LSpKX@r*i=AsbE?hO$P>
zSowl7!z=STGhRQlrFhsH0t8z!52CPiqvg1AQz7UP`3C|Dv@5Tk7@F@YD2HEtcnv)D
z$l(&h$i<EO_!bTWUjL@;xuRteg?{4y&g-rcf&ki?bGHpWV$eaR*L6y--ud&4K`Hz|
zMp&-lb-XNBpMCe?CjtcsB+-dxrvb-ZcNtkWLw*P%pu!xHX_G{4B}sS!h1x~1g)#o=
z<w*{IwKoxk6}}c(S`Zef(NYHj=VE4_bf_XlG&&fS8F7&3j9=`r)MHdzSZEDjbg4$u
zQb?l5!7C*e;$%)DAer7^{rTih9Wg#6VMA`Y7gZGLsc={hVG^}tL`O}-1VnMEpdJE=
zL}eJ5-o5z{7f5~SP?qWJMZ<O!NReDnipjK*CUQB0#u7{H<&zXP*ziMm|H&2HL}MQ2
zPN(aX(_dr{I+_tw@wJ*rbD;XS*$||9P1kBvcCHtZgj^JN>tQ`GN8k)&ijcz~T$)De
zI@Yu>psEHUh=Uocln5CwP|&BVPO>%xqIN1&0vR%ZKw-ga=xsMFvE5EsV~Yp?64eJP
zd=SBT^l8^zm}9#8?rZ%0WFC6i<*V+x?0Q6FjW)yuioyEs+h)Qg(I`h$*{0{9gEY!m
zaZpSAV8gxYN!)RS?XLLm!3&GjugV*zI<ZPaEyXdyS7O;RRSWe@kODpj9YH_<J3$N|
A!vFvP

diff --git a/koha-tmpl/opac-tmpl/vanilla/en/images/front-arrow.gif b/koha-tmpl/opac-tmpl/vanilla/en/images/front-arrow.gif
deleted file mode 100644
index 8496171333b1aa98da37b5bbcaac42b27a1d5411..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/koha-tmpl/opac-tmpl/vanilla/en/images/front-background-med.gif b/koha-tmpl/opac-tmpl/vanilla/en/images/front-background-med.gif
deleted file mode 100644
index 98a8f8eb27895595de750e9daab92700ac324745..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12385
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
TdhcD~-G1ZEci@5t9s&S6fuSvw

diff --git a/koha-tmpl/opac-tmpl/vanilla/en/images/heading-login-2.gif b/koha-tmpl/opac-tmpl/vanilla/en/images/heading-login-2.gif
deleted file mode 100644
index f4f388ece0d45450986862667a6c32ade3d9e6ef..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1140
zcmZ?wbhEHbjAK+|xXJ(m|NsC0{`LEp&tLiZ1%Cbd&CJ3oDXXw$_kL|>zZo00iJ97P
z2#K(9^PIkLQPwX+EhUFvU5i^ru6@}m?W!7Pc6L!QvC@hPzXh|Bmd#dHRf&y{>zmMT
zXk@r=&&&`XyV>no;=+9Y&dhxO{{7v%cb%M^7#SIXHiB)Y0-^Ymg^__lok0g=7RXNy
zZ2u2TF7UA7l#$_ONLUdf)pO#Jqh{3l8*9o=zpdK;U_*tE-t6-)zFb=vQ)jbiM~&a|
zYCG?S)~1)g|2H%?HMg|3wRd!Ob@%l4^><}WnjDcUTRLOrELm@!3G){$T(o$}(q*+%
zR%Xdm%FkLqtHN7g`POaQckJB0YEP!JI7_9PtilE*1$nkgQBDcT^A|2&x_ss8wd*%-
z-nxC~?!EgD9$s(T`!s$3!Acf+g@UpZFTGi$<-UIV{^RGb-+%u8`_I74CF8MS!NF!m
zQJ)A4#ar^l0$VLCHmJB5CQCTBL?ksbAL>_d?vnA`q~h7iExV}eL{JB-xkU1*iLM8h
zoSkh^{OV5UCdDoP+jW(>ZcK1*ww_sbi$P=K=9QP12P`!5`N@-UVYQ2rL&O1v{_E?-
zZn(;NZ(9@DXe+tuOY>G;L3Zg!wR3kbaqQ#{{`~6h>Fw+9?{8q{mh;)M;o;#9{$TDW
z+ukxHxauEcS-9n3`;i&O+4s)u+?;-{o6)qd<AG`e+oXw?7%w`=-8;V_`Sd*B-^HfK
z7FWkcBq?pp@=@^7Nvzto<Kts>(Is<tm8Ir+y^Q(Wrn<VxB6C+s?EQ0lcYnXVV}7vK
z#wQ0ZzAUxLVY$G#^Y`};yn6Y1bwP}a3@%=tc=TWOwl|Fp?j7|kVi^i$O;^JC*q8A>
zmUb)WU}s<yKa&2iRpQZP@mj8LPXC$Iiv<@ra>`G+(U=(*>2SJHXWNTM-3I^KJ=!C9
z3)s6#3RS||Y`#_8DY6Sq746;2GvP>#VoAWF&euzKB=rQiX+E8D$Hhs-<;9ak2J2%A
zi+y6x253H;k>X_ec<Nq*6St-JyS|v!UvTW_l^Xkvt!h%vqNQ=Oy#&>t&u^HuC2_9A
zoy=pkYhP@Sm*brB^2Oo_LLMCp(>F|-zo__wJ9onzsY@}-7qnS%EX|y-{P?^XtG2sT
zH*R~C<ygX%slGCPhMMfMZoeO|*6mSSBDQc#)5LRZJFW%JEpI=em9=T2+3DD(gH4H^
z8%r8qoZNIHZS~tt7iVphX4o4j?Ot&BYu3AUr#`k$e6Z%Om&-&s{zc0L-R0(Hzu$R=
z@wT4$(v!mLv)1ekyM2H~Jm<rKg}gi8OL=XyyenJjap3qik?<TtP42}XBWzgy%;rq3
zj41nXLS=f+ri9Ba(>IFm4|x#Ed}P5ZMw_^^#qZBPTekJusYHtcCSkqj9^z-#&&~OA
k(L;ES!ET$$jt7~!T@E-f`#C7Giu$In{d(;wFoRkH02;&kF8}}l

diff --git a/koha-tmpl/opac-tmpl/vanilla/en/images/heading-login.gif b/koha-tmpl/opac-tmpl/vanilla/en/images/heading-login.gif
deleted file mode 100644
index 422c4679c31f883d2c00d0a5af40551367a11294..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2475
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
MT>C97@xQD615rgt$p8QV

diff --git a/koha-tmpl/opac-tmpl/vanilla/en/images/heading-member.gif b/koha-tmpl/opac-tmpl/vanilla/en/images/heading-member.gif
deleted file mode 100644
index 32013b2d0426ec1f76dd86e481a5b16cf232b1e5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12926
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
D7H*TY

diff --git a/koha-tmpl/opac-tmpl/vanilla/en/images/heading-search-2.gif b/koha-tmpl/opac-tmpl/vanilla/en/images/heading-search-2.gif
deleted file mode 100644
index b879eb4309f33b47ceee572b971ac941fd92e350..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1245
zcmbW1{Xf$Q0LQnrnTKVQnMK$a;cRzdS5bPk*E}s|=d`@8B3##@l*&VE=gOv7HeuRc
zq8zQg@-WQZNF(MXY&qNrSDsUDi1IXxc6EP3pC3NIeO~X+=a)~wA%9P=XcX89GywW6
zy<Q(fjM@CKxxTi(wzB5u=<i_exV*ITZt*=5iPGslY=Odp;#k{laI(f0ybsNXnT6Ty
zZMY3>V1iKf_7QW7Y-n_+pW>0ut|mKd_hskfnW?+Dye)9J1qPGMU^wh_jEFpOGdIWG
z!`;%{baQiaVPRopWQ0s6gTdfW^#5CYp#keqFbISP5kBWXZz37!6@v2(fjkh%=#70>
ztcxx36hAM@^NA!yHP37rmoli|6!px=m`4Br3{Q`u)x4O`X#3^QVXZ!m#ZJF=JtLEI
zBa6$+zL}GSxx&X=3xsL6$c5nm#qLt+J&`fR-1=4-A0w&am$7WB|B%(yKWum;Z)8{I
zOB?06Z8szZ0zq>P2LJ3?=dl0^Tr?oEOR#+M;^oNb*!TpmvnA39C#JYwcn-Oo0J63G
zb#i5OO}jp(>i*FgH#F+Tae#kkYq02&8>^6(wq>Fm0`E|2@3nKW#M3W3YegM5%&dH|
zUKf3?k$O1vMRZM6V~PO^Qj#_y>Mrt3)V%Cka_Z9aoxxj;DD&bzFXqpy;YwM#`T_N7
zF+vw(2sTSVH+UcGAngMIC0RB>^%8ZS{Z&&)`Z&u_xHt(Zz=7Grjf^D?>~@%@pVZro
zzygP>qaD%Ys6|yn?NmpuLr^jG(eKl$0^*slAc3ny5l-W2D+HB;d*AEMo#>X=%??UW
z`s_K%QKQU}5RV~cT_qLCJ!N7?Yif9>lIcwYy`WF5M;|X>84kex<h-FO(bnOR{Zn%t
zZCpD$ug3M+oM2|Pt7Amp%mCkmLi??0^Mm&I;8;yl{Z9L@a0WK1Nmvqio9Uc*oQ+t0
zb(emoN(u^7qZk39hg>ZCnYyGI{X{12W9tN<+OP~J%_3sE_j85^#<^}!%km;+rzYE@
z&KuoVz~Rf<R@Q~M^Q{~J6Za~QV(drTjw?g;Kr?ru*<6pXI57`dF`&XidE;r}=*6Ka
z@ImEDE6m2R{B>dcsG4^+dgCygG$&z@qHXDeuZvSxyEsllw~qGMg#I|I3`EG~>3h6F
zfmnE?l<x;dLqZC#KLE_aM0ZkLpNo#0x|75UM>*(ZUtPJTB6W4D0`<2dT629^dV03X
zzj-nfr8kn3(}We25|$zJ^jz&emb|#qx7#W(6ph2r%l7mc4jGe#nz{0KRM;)%?n&3T
z4ff2+(MT&@t!~b}M+#NeC*Mz0?z$}tO>omrLa5EH8|6yEtGDT)URS-RDp7v{03lTk
zd>?TI6+ozEO#I^lHI9Txt()9|Qc`e#2H~O~GDA*2ry<1CJBYBo7f$YIA}l@oH=Bb<
zbdu1^lp?98<pCvVi|QD8wy>+W85gnK3&r0}>Xi$%-#P{0zg||fP#)ve%e47rH~)a(
z<kpCo14#$@21-2Eq-5zS-20M6?$eaM__Yy6;`6b(hz;Tz6?!N}0k>7;zv<*Se+&^?
z6wUa->{Bho6Is(|*Qbel&(&{-(cK`1fM+=yP5*(_ZdLZ6TBngbe5;!!e|m!b{{b~(
BI1T^+

diff --git a/koha-tmpl/opac-tmpl/vanilla/en/images/heading-search-3.gif b/koha-tmpl/opac-tmpl/vanilla/en/images/heading-search-3.gif
deleted file mode 100644
index 8396db6df93a650a0043b4f12417f5a84971f939..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1306
zcmbW1`#aMM0LH&F86#xcTxM<ASe((Q2tB99nTghlJUPl;C{&VmX4SAFw_)aTRF6xt
zp@rrymyU|uCP$nyoZJaRS;E<=^Cz75hxfPl`MmEhucH&$`mnDT$Osq&en>8t2U!Mf
zZ*FhMHe_F9zhKFRFzn~GFDuej4Gqn2-!{RDJDfvebPdp=#uih1sy!nSe$Y-?OIt}*
ztxMc*nU-fjbu$VG)i5?uMWSp{xTXxIc~UYM0@)3RU#HUzaoF?TUa4suq6HBFQ{Ud+
zUS3|7NF*c@2?PRtr~lXDe;Q^(5d;9Hz)wH&KQ<jzlDG1%)E!R-0F{}&oxymNMqoy|
zk9B)_RM#S-WxRs!VwTr8D`ND7UpB>J$9*)1m%lPcucV!{){lveW8b+OpKvcRDLEyT
zla`*50*~RD>gVLfWs@F+=NEWjD0>(sd;ydK)6W+2;8o9fLbidZzM-+{d2>r^+nvg+
znzmMMXL40uPELC@-1P0+-ol|UM+!tB5$uUTyqTDsnx2`R<Mh59UJ6%1mr+b2M-`Y6
z01CmHmjhrZl5X~1bVK>WeE>vN2isg<m-^;&6z(bMSY90Is4RNTLE9%HovI#na`CRE
zTRH{D*xBY*4rn(*L67-v%3>0I`5{Q22;hCrI*IuGMHH?H0cttjeax!pVo1l6k~6k9
zW6dOQs>_C+p3CcHnovqTFp3Txr&`xcP~bIy4LH{dC5>L*4WSoj%f|@Hs06X#>3)`q
z7JB@AcU`4_R`knMT)^VfKn$1+9PHLrxudCrO+uY$5X}wnUCX?B8mbqDDmF53m&#VB
zo*9$d0~g>z<gIjn)jiavx|NBJ6I~9U=b}h34LytCg>?c=qkwy9toM1N>|K|!e(4+%
zqkQ<!vIQdAk<=wKn`jyOU@^h$Uu{_!>ywMN<WimyEG&>W(`$D|Fm%FQjXmRYTa%2(
zT-9*Lqps!Ze5FDk7MIA!4U}jsHkiW;{&>$>V(jj%msrL6^#had=<bvt(~eP`;!mX7
zL1T;d_6H1qv^6~7#)%)DoXGXVADWxw8adS<jqTrO>iVkhleU4*-9r2M>YbDNa{{tL
zrgLePuEpMHenp?+gEQI+T-v)3<4lv)gWbQM-nBm#eD_oZE*nA*8HOMtS<{8dhxEh;
zdR9UPNI2_&lNpfE>6qx$sQI}PPGpA4Zy8=idC2T_vLQHfbZ)+kJ|zh95N6JkLHiY2
z^OBn}L_~S3l5=)>^!tWaK)n&((0wsQW&W9%!4QjHJuc`$cJ=B|MI%w37YH%R=@`M_
z!?pq;<(7{8W5SD?1+&xbT9mN*02*&`pT{ZbQuCG;4j1@2Yo)kKX3^Mpmb%lrxK_>T
zli>?6^@2Zo^^kpdtM_cc@iuz*z;WXJZmm@!cGJ(L^EDglY^IKIaJ7wfyGDHFe?Q)#
z0a_K$j)tv&TI<^+xZryH^8q|CaCHl&1yvhd9-zfP@~d=+-(_&b+Os;6_7~`g9>go2
zP{aD!#`4;rXHFWd)T5+u()XXE{>g-!Jv+^eBVpWHN#q|*wWASn`q=Tj@#nG;bA%<m
z?q;0J*RjqK0{w5It<YKm8MG;_3off<*+nqL>z+F?Plkv2CBlYKgu+O@t|||u?XaLL
zwTgj!3)TCw)O0zsL`-T9C-2zXzB_0s|A}yG)en5TUK*xNYg0zE#~(va(|mWp#W$9>
KWrg2w#P(l`)J}Q;

diff --git a/koha-tmpl/opac-tmpl/vanilla/en/images/heading-search.gif b/koha-tmpl/opac-tmpl/vanilla/en/images/heading-search.gif
deleted file mode 100644
index 7745f0c343f188ef9c9fb94097ad2d894653c8d3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2524
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
MT(6E%5e1n24|9xh4*&oF

diff --git a/koha-tmpl/opac-tmpl/vanilla/en/images/hltlogo.gif b/koha-tmpl/opac-tmpl/vanilla/en/images/hltlogo.gif
deleted file mode 100644
index e4a2f5cd9891041ef60737e0a488e78b9e807424..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 99009
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%0A)^TGrQ9}0djw6
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

diff --git a/koha-tmpl/opac-tmpl/vanilla/en/images/holder.gif b/koha-tmpl/opac-tmpl/vanilla/en/images/holder.gif
deleted file mode 100644
index 35d42e808f0a8017b8d52a06be2f8fec0b466a66..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 43
scmZ?wbhEHbWMp7uXkcLY|NlP&1B2pE7Dgb&paUX6G7L;iE{qJ;0LZEa`2YX_

diff --git a/koha-tmpl/opac-tmpl/vanilla/en/images/jigsaw.gif b/koha-tmpl/opac-tmpl/vanilla/en/images/jigsaw.gif
deleted file mode 100644
index 2b563734753d7319fd5ce9c68f5e48d1b10e13d1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1982
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
Q!pc^<@|CazNk9MqJ41MoYybcN

diff --git a/koha-tmpl/opac-tmpl/vanilla/en/images/koha.gif b/koha-tmpl/opac-tmpl/vanilla/en/images/koha.gif
deleted file mode 100644
index fe13bbe1c27af22557e08e10e8b93440bfb5d3fe..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4365
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
b<MM8t#fXjPh;7`6eeQ^3<w&&=1h)Ji*kEk!

diff --git a/koha-tmpl/opac-tmpl/vanilla/en/images/large-print.gif b/koha-tmpl/opac-tmpl/vanilla/en/images/large-print.gif
deleted file mode 100644
index 36ccb9726a8e14ae9aaaa6048adeec0fbe4caedc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2127
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
F06P-=6_@}3

diff --git a/koha-tmpl/opac-tmpl/vanilla/en/images/magazine.gif b/koha-tmpl/opac-tmpl/vanilla/en/images/magazine.gif
deleted file mode 100644
index 34b889f56795e79ed216c6a486913799fe796368..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1755
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

diff --git a/koha-tmpl/opac-tmpl/vanilla/en/images/map.gif b/koha-tmpl/opac-tmpl/vanilla/en/images/map.gif
deleted file mode 100644
index 083cffec4f54c217449471fed191f9f52b77c6ba..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1607
zcmdUu`!~}I0KmT(mW#wDk42=C2%S0}>70<6N3k%kc^!uIn)jp9hJ~ye8TQ`3V=}Le
znLS+_W9E^ele*n=mAdD4Pv;(WZ{5><9Jl_A`}yJX^XHdObPO^$B+m!%1O5bn=Bcgb
zsh^y^eD11$gj(B@)GtV?=Ooo;lj>QM>S>d5qfxoupjd5G8XFW(Jp4})70X2VB2jK2
zDhvdfo*<hi$n^yI{2kfc9ht6PHd8;Tt)HB}Jvnt-s=hTLzd0czOibRKkk&~gbrX_0
z$#|V)tae;nJ3d-7K2keAQZqJKJvLB1_P9#iS1ICEiogmHw?f1zA7z%0GRj7J%0{|N
zN2vJW4*YQYjUn<iA?d2H@p6C7<^Jj-L3xn?kL$gH>n+LW<8ruZxx9=VE+(6kl+8)b
zVkZ>yGO_HqbY^4*GcuhKj-dr(XhBKcezjm$W=|ltClE(FeVrCkK@Y2>hgH+hHZdYe
zjL24I)IBD$jfteNQ0=Uk4pt166-#HuGuRjCtP2d*1r9rb%T5q*F7>j}k2y&~PVx{Z
zdGMQ4hB+x?+*A<<BjKh=x#==)hLW49;$jut%<p+wYA$w$m!sij&x3h$yxci3R}bdR
z^YWI#{3S5|30SbkFI)i&Hu!~WAa0Xi{ET0WfZK)~bKUN}Hr1MW+#POfWx2b%ySBDw
zG#Xb{R+g8SmzI_m7Z(i%!@|OXUa!~bbhERwGcz+<tyZJasMTtfN~KgP6$*u1E|*HB
z5{YDNY)mW`kB*KG4Gj$r4hn_Bfq{Yk{(gZ#(AU@3+uO_M^Fa_~u~<wdlfhun>2w;6
z*4^FR)zw9%Qad_2C=?2rOm1mu0RZ4@&sYCX@%REU0RRo)`>p@m699A<XxxK9iMX0Z
zsDlqyFXGKK+rdp4C^4vOu|I}<t{2Cc!447f;-S7BG51~5VVgVQ(<q{2K8Ad$VaCJ;
zl5N3QDCN5xcO@Fh9z+vSynh^<sYly(anbSEX%Vn_G{y#3a{o0<xYyAd0XRe*yYkQ+
z5qvHn5iIKRjZh-@DbOgp+`bdIVE~)~ECcG0M6)1+OGx-QV6fkS35JfGg4uZnTkStx
z9%L)*2#Mo|6%s;LVm+rH8Zf`%1#PIfpYNyZTk4nWoSLE3@g0-DLecbR4_wx>q1Gq|
z4c6sT@6DDKW;7aM&N-u~!Ub0d<DX!o(5w>_uzZ)vqQ<ksT;<RgvIA-GKrB}}dhu4i
zTQJ(Cw9vg`k@lew6-{y{uO8hO-JsG$C#;(|SU7FJ4WD<)Sqf)Yx~354-K{Mw$&SV3
z{Za7JEt5IYr_#<Sw?qVS*4`NMn(g|xF(t|a?~JmKj%cDpTLrxoX|2PYJUU$y)Q;u{
zH*BhNVPUrdAde6sfwOz|o_{q5PrN2^x@Qk3HbO6+e`N`$9-w(;C3{;QiGii9CLhH2
zw9mVJSWe4_Vg4XKXFyFJX&_No-@u#;3dAIjY+!xPY5UVV5}x9hSPZY)k+#E2fP8bf
zjgN<}Ce*?u+zg!<n1`D-Pk{iZ0(OlB7{r@gf!p2plZcxS@M07!;XOCPp5O+Fw~TmM
zlzxa_<*ajV`bUAb358vuBw|-J=#s0y#HPX+w_VMFns>M?xZ;5~^3aVT49Stu6qp)c
zfYbeoOzI3r!Kd-17Ww7>zW&aCa<;*c^7(V;to8XYvC-vv%b8Sv<%VgT4|tHegFHu|
z5X_xr0iOF$KJ{Gm5fH$I$cn=sv=)Fj;hdQpu&;9(#vqq@Gdgu2k-?jGk(MV{SGAVG
zkSMX=xTMVB%}j1+#~fbN8rIo8ZS7th=0__(`Fl_4reZ5%aY4|eZ9N>ir!&U8Uu4?m
zTd{ti?YJ;ZUG)P5=k>AGyRXMnw$(>5jXj$2`&o)tC$?c>`(e(d1+ROl*T1|qHHQFa
F{sX?1ouvQ(

diff --git a/koha-tmpl/opac-tmpl/vanilla/en/images/picture-book.gif b/koha-tmpl/opac-tmpl/vanilla/en/images/picture-book.gif
deleted file mode 100644
index f4b7fa33a4ccc4d755a66ac3c13b08db98507b5a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2219
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

diff --git a/koha-tmpl/opac-tmpl/vanilla/en/images/place-reserve.jpg b/koha-tmpl/opac-tmpl/vanilla/en/images/place-reserve.jpg
deleted file mode 100644
index b9f2190cd65d41a1f3205bc60eed0e80700a58ab..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9357
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

diff --git a/koha-tmpl/opac-tmpl/vanilla/en/images/search-button.gif b/koha-tmpl/opac-tmpl/vanilla/en/images/search-button.gif
deleted file mode 100644
index ee3e3ca714dbcc34b36ff1de00dbf1d680a557c4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1600
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

diff --git a/koha-tmpl/opac-tmpl/vanilla/en/images/selected-circle.gif b/koha-tmpl/opac-tmpl/vanilla/en/images/selected-circle.gif
deleted file mode 100644
index b242655b70421b34fc334289013d07b5e874ad0e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1094
zcmV-M1iAZ1Nk%w1VH5xq0Qdg@0RR9K5f2m>AR-(h872`TARinfE+Z*4P9Fs=D>64L
zBP2H%DK9%RFe)%GF)27AC_fxcFbpy_KrBTdaw!BoJU&M{GdVv;G)*KtM>IH5C`Cm@
zVn8E2RW3(LP*zGpL0L0TPEeUQ2ToB|LSZdUSVdJ;Rg^&&UQ|g;V?K6MF<4q(S7A|T
zT25bGU|wNiWM(;6Ye`~dP`yP6hE-2$WLSt?GiGIFePBkUQzuz<MO|@GW^Ph>Wm;!z
zagJj^bZlgBY;T%dT4s4yZE|yeb3=4^U3YYBYJOswZAqkLWwmBK%3&sZdU|$ygLZ~!
ziF<ODeo&=&P>p_lfrEpHg?XuYZGw((s)A99ii(GelcI%i(RM_dh<k;TdY6rak&uzK
ziCKu2nUa`!jG2X(n1{EHbefu($c|m5n2eL2qMe|CnxToKotvSflcl4Iq@$g!p_R#&
zhrOSBoTsbPm}jk}oTjRlqOO{^r;MtqsjjP_-JWLJpK7kIlBKV+xvP}hn~<uqp2ew&
zu&%DuqK&w&qvND)%BZ8rtd-lJr>wTM#<7pIw6m_cs_3V3*{GMgx1PDSsJOPeytcB*
zw4AlOv9rCrvb@E*y1L`7kld}Lyu7l<x~JK+oX5Sg(z~R+#ka`Bth>g@*}JsG#l-2j
zs>sN<#K+6g#kI`G!`H^H%g4*b%)-{ky4=RH#m&vc&DHC|r_9X8-o?Ju%)8CdyVuXQ
z-^;eo&(6)$$=A=t-_O0-)4%J<#Ld>#)YQ_~)XMM8y64Z&`N_Z5*Vy9K!`#=@>D9m1
z-PY#U%hcW6+}zjY+r{nH&DY-J=G@Hd+sNPF-}c$g-s9Wr-_!2j%=OyV+~wuu<m2t*
z(DUQZ;^*q;=jZO`-1X+u<?Q6-?CtpH*Y@Y$>+9<L<=pn`*7NM%=kN6U>(}q^@BQuC
z^zZ5H^z8rd+wArC{PW=Y^X>KZ_4N1s`}g(r`}Oku{rdX<{rmO%`}_a<`}+U-`v3p`
z|N8&`{{R30A^8LW00930EC2ui02BZe000R80R0IZNU)&6g89^u%hruuJ$?rXs_WFH
zhYB1};vCZ#(cdm8T?`ppnCeYNc?UlN@|NvbFlOH3RqK)lr9X)Nyg>ofZB{2kfF!9p
zrZ6PIe1^72OBJU}6p(2;1yk1xO1FXPx&R6m2MP`q9B@QQ^C_D*qXND4P(=|3hX@fk
zsDNVV7`vtenW<oA2#N~0a5-e$rOr^4oBgQa2-f#6U=Bs%>|)n<V74NkI&Eq3Hg1cZ
z$H>L`(yz3<FL8pIRH5R7iXvpGW!v&;V82gLc71x&#Yhq;QG=2DRK=!1b~KNrGGxb&
zp-;k%L2-4|-|Q~4g6#@+j9E6^kq-7F1D7Vs7eJIc#n}QS6~unxk9EaS<jW^{@Wm6%
MU%I3JhyeirJMUj)sQ>@~

diff --git a/koha-tmpl/opac-tmpl/vanilla/en/images/sm-book.gif b/koha-tmpl/opac-tmpl/vanilla/en/images/sm-book.gif
deleted file mode 100644
index 9514047b154f7a7f954fec0a1cbce3dae6d60104..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 410
zcmV;L0cHM2Nk%w1VIu$|0HOc@|NsB~{{H>_{h)_&X<19MudUnI*8l(iA^8LW000L7
zEC2ui03!e+000C3c(C05@To|vwAjuSddS%n2#a8z*~gflG6uy^7{<w}TvrNoaRx5a
zU^txBMmE8RXDGymwxD1@AQGK5Tk~lhWChY9wOe$OyEId{05CPXgm`x*B&5LrqzsTQ
zZO1ZSGzL_6YkW>dB{6IQiA^<yS%)WsByT=UgFcdKc|vTE21o%-1eu$3op^eUqCSYH
zCRip5tA}@erkRznx1Up?SPZ2FvW`YI0KctmJR}^uZpsYIpnTNP#=K3?%XX8%ds~Bf
z(&Q-C!OokP+tWRx>f>ohv6)!q^TI~3(wdOI84}m1m%C$$=m-qgERnZj2y0N=*QSp)
zSrwnz0_RCz&#5d9{&nLKqsl;!ajF<`=f#bglqMOv90HTbt|u^6u4Dzz43(5WY04>M
zsbi%<TT15Cne2`yVDOOol<^2@5&#>JXhF)AYZ4_b8hH2$&}tGL3^qK_O7<&`1_=NF
EJ94ACO#lD@

diff --git a/koha-tmpl/opac-tmpl/vanilla/en/images/sm-disk.gif b/koha-tmpl/opac-tmpl/vanilla/en/images/sm-disk.gif
deleted file mode 100644
index 6611623cfe201bd6adb89d387d2f10552e1aaff9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1716
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
K@fSe>0RTHl@tb`B

diff --git a/koha-tmpl/opac-tmpl/vanilla/en/images/sm-dvd.gif b/koha-tmpl/opac-tmpl/vanilla/en/images/sm-dvd.gif
deleted file mode 100644
index 2f47270ca2093322aa1d2c7d692135b08fe96b6a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1734
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

diff --git a/koha-tmpl/opac-tmpl/vanilla/en/images/sm-jigsaw.gif b/koha-tmpl/opac-tmpl/vanilla/en/images/sm-jigsaw.gif
deleted file mode 100644
index 88e7684ad15617189e1b05b707da5d27f6de3fa0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1832
zcmV+@2iN#VNk%w1VJHA20QUd@2?qul85uDW0v97HFd!5sCnp~*HCZ18F)%PDH9t5w
zI7l@nE<Hv<LPIi0Rf#eSTtzcdN<%wSV@^&^Wm6PkQba^tYjIFBS65fDKnHGHOMF>8
zQD}E$V`F+|8H8UysZuA&NeFjlSc+>CYiw+VW=K+eUQu?7l4C%3Y-7JwAaHPQVs?Ru
zYgKV_awL+YbaZr@Y(;)_YLjnKtz|-qa$k3McU^*+fOv5yvM--<N@#(Qe|~;mh@;78
zHI#d2oq1b>f`Vg=rmcEVoPTJBhK7)eS(Aiyi-v(}lB|k~iq3dIkBf+njg6?1Eo+#y
zc9yG}jDNX=SCNm7ri^Kblbw-~k#d{0gO;R}l$0>M(wmi!#EM&<m5Oeo#9OnZcA~z9
zovvBKUUsCwnwpw#vy6GB!l0X$cc;dsnvZ*^#-5&@OTo!>tj>F@$<mf$qoSg#p_tr}
zZGNxLq@||Jswcs!O01=ysHmxdwAI?3Yp$uLjkC+EtE;oBp?lDOt*)-&p=YqLu;Zj{
zx3H_Sva;r;Zi>L-V$<riwYB1{X5puaxV5wBsd2o;VC<@LxVX8!xwhx8d&Rh^p~Bbi
zt#iD*yz;Pj!oIn`zrX0UjP1oV$HBdw+@H+Aw!_21u*urR#l*(P$IQsa$;rvz%z^8{
zpZB?}%gfA>;`HXyYtYQe&d$!i*5T98&e74))YH@N&9TSX=GE2Ks_69E*3;M5*V@<C
z+1c6J+S=UO*xTFO-rU>X-rn}(gY(+N;o#ub<m}_(;^E`u<>ch%<l^Jy=J)8S=jZ41
z<k!;m*X8Kx=;-L>>+b66>g($1>+9_7>+9<5?br18?Ck9D>+<gI?(FaJ`0e86_UZ8O
z@bdEV@$>Za^Yioc^851W^7Quf^zroc^z`-i_4W1j_V@Po_Vf4o_xASg`}g+v`Tq9s
z`1ttw`1t<$>-qWl`uX|z`uh6%`uqC%`uqI*`}_X;`276*{r&y?{{H^`{{R2-{{H*^
z{{H{}{Qv*|A^8LV00000EC2ui04M+>000R80RIUbNU)&6g9sBUTu87V!-oj_;S*Tz
zUOjvcA!_Vb?_WJgJa)-rcQ2zxg%TaUTH(L}k8ayYo=hlFps*qgIH&>Bz>>CZ^-Lb@
zC$XMUc}SDWdxx$cH8>3<B$<OI4+jjkkZpT+52Hbj|N6~)#}1uYbnwceqb3N0gC28s
zf~nGmL6%<2xLK4pabUlaBpL`FELg!{1qE*8$unk5n;$B|Bq<O<gN6#L@&)xPubzSv
zJyz@x(nH9T0VhbGU~t012`_Dws0cyiNq`Gd-dyN&kDbYW=*BhJK|_U(Hg1wg2#{o_
z84Csy0B|uxMTQIu5a51e=mQ;b<n9gs#79osa3C~%gqg#^fDkZX#t1oaLIQvcAu>ET
zAmGA~+}*8V%{CnggpWAVGyvBQ542#FdtjJx0szth@IVF!9PmI00ze=I7u<b7hBMj}
z_zynaJkvlDHvj-Y09ZV++!J#QAb}e8?dPHZ4+MZhZhAZ-A~PipbWb<VD42i)H3*<U
z5?&Z^!xIMd07i=gIKaS*1Z?o%hk9&429fd@*$p)c7+`<{I|$$=0s#~tX9Qt1Fu(u_
z3;=+e1pG&U0u>-|2AO6iDa0IZU_nC&A)qh-2tI580SG8SfPx4O9DpGKAQEuGAr3G>
zVwnORsbUXifPuylA?PSTh8t%8n1KKQ9FU&?1Q1XF7I}m^YM~7Xk!l`OaJb(Cv|h)b
zo3%1}9SBXBF^8|(kou3Q3aT-N1R7YU>8<$jXDfdXfItKjShz99v{U?ADw4sPQDLk+
zx`-dLZX$aC1Z_BAfCXygVL`jqnyI3U16;vD0LboXA)~U2n*j>Toe;nYy%KEgkx9y!
zfEz6efMKiO?#HOfLpboM0~~-VYQgWKX@H*FzIec%1l0Nfm;BXAKmZBca3=!+WZ~|$
z@SgC*6JvNW0|*cR(8Co~f+6J-C>-Db5E<0)#1%;-@dN`+9F46IiB?es4F@Oy0bL0s
zkw@HSsPMo55vZU-6=<0MVMebnTl){ZLabU`1_40f0}X9NXF&iwEE>ZJ1K0{ed|*r)
zI6)~Ym?{)a6fpn;-C~i1nkN9E0u5#yLirCgTro!G)Cw*RG{L%I1{!FzA!7h7(B;PP
zV5F-Y004*K_urvXQ{+J9eI~^8)Kh&z64X=w#N*dzZ(0IVXhR@D=5*760_dlYJ_72u
zj{pJ;w4c5p+lXW0KksN`4KT2v63Qn4{KWqPNI(IKA`}AzASqta3u0KqHw3wdIkdqH
zVDusvxX7ReH^{*b;$j!TK!!EQv6=DIgB{(_pEan#!WO#lg)pRsHN=Mwd6c9eMR|t~
W*}=me`tXN9)FDy@@X?om002A7te>0!

diff --git a/koha-tmpl/opac-tmpl/vanilla/en/images/sm-lg-print.gif b/koha-tmpl/opac-tmpl/vanilla/en/images/sm-lg-print.gif
deleted file mode 100644
index 791de813e4d12c3cb6fee80d3db669bfbc2f8c0f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1788
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

diff --git a/koha-tmpl/opac-tmpl/vanilla/en/images/sm-picture-book.gif b/koha-tmpl/opac-tmpl/vanilla/en/images/sm-picture-book.gif
deleted file mode 100644
index a90cb11a8cab8f11dfa9cddc08e01b4f9e9c8403..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1756
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

diff --git a/koha-tmpl/opac-tmpl/vanilla/en/images/sm-tape.gif b/koha-tmpl/opac-tmpl/vanilla/en/images/sm-tape.gif
deleted file mode 100644
index b33d7f6707e80b9e1e53e28d33a6a259f7bc594c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1634
zcmdUu`#X~h0LS0Go7tGB&FHucb01<vH4!tz+-hkqX|at{oK$Z0;3;`$Gjf}n<9OQ1
zDsqj{>5&uXndVL|9lGcy=1CV3a_i!p&VO;fKYV`v{P6ku`TJ5_xg@|GSOb6y7cRKD
zxg9ug;KPRxHa0f(_4QAmK9xu$N~KaH5&;0<>gu|>y6WlaSzBBC`0?Ypxw$W2z8Dx7
zWM^j|KYsk{*RLBJ8+mzoXV0E>badRgbLXK$hrWIL*4WsXl9F=z^y&Eccq)~8@#4k3
zd-q01M=vZa<mBXdd3gl}25xR{78Mo6#l@|xtnA;ve{F3|UteEOPjBD8eZIcF78Vvv
zCNm}`CO<zPi9{9_7WVh|i^byk`T5-3Tpu4FU0vORf`X)^Bo2oo5D2EHrw<-H$mMe1
zzI|(JYwO|RVPaw;6bkq3*|U51ZXS;ZL6E7bX=-XJ8jV&{Q&Xu_y}i9XJw4ss-2njs
zL?SUFBErGJAvidA*REX+4Gk3)6{V%6=g*(__V#A6Sa<H+dHM2XW@hHn(o%78aZOFl
z;^N}FckkZ3c{4dV85I>pp-`NiogX}SFf}!G<j9fX;b9mIhC-oYV`JOe+HT&wdG6df
z1OkzkmPV)3+uPeeefp%XuHMwtL?V%_t*u|ZdSz^EeDvtizP>&hjkdhJeDdVUkdTmx
zi3zz}UR_;{#bV3K%G}-EwY0Ph4Gp!mwS$6!T3cIZXJ^@L_M=CSK7al^Gc)7w?~lP?
zK7RZd78d5@<YZ)IWN&XTl}g{gf8W*B_3YWRs;VjmgK^@-iOZKSA3JueqoV@^!J(m{
zmX?;t$jF3*1T!<Uk&zKN98M;a2?WC7!-wnY>c+;#{QUgF!^2BTO89(!XlUsA`ug|p
z-?z55{*C1SJJSusfATwi@W&?r)D{4t2@JWcGaH4sW%tRiDMeWG04bySdUrnNLj3c-
z<{Q1micBLF7Mkk4OoDtCL%mdrXdBxu*!VSX=n5s}-ShO@gSU2VKUb==ZbuWirthAM
z9QdR5@9N-ZoUxw;!X}77QK6<yCmNeL%8N#ttAj$^ndDTSle|)--+}1+J+QU$MVku~
z5qYVyxJsLD4+Og0@XAu=;_adeD9E2o^a+Kg&RL{D7F)G4In;Lh&4~02F3-$T!yN9L
z`=^}BRhA>nSaVEhMx@blFZGG+)=Ytxv6*5#9USO{qv-nU*GKsxJT}}QK^{sU%2j)E
zn=EeTDeJNO_>wK$^y_Xkx~D|M+V2GvYl$ay9wwV3q2R;r$Nl-dUx~0fDbd?lPcaH)
z^jfwOa5^iaLi_=ejH-8<L!^Ovytr(n3xnd1Z)DTpNHXEKt9&~dmXA+cmnpPKF0xMb
zc7SuE5Fabn#FOO7+1Q(oTt9m&tGidpMCp{TdN7F^Xcu?aDW-4_C^pw-23^YsVb4wB
zTK+n<FUbRtBMsG3AOm(No_BUhLL<w)01l9y1A2&Qd`v`cE$0%qAV~;z5Fd7GCx(^B
zVD#vT5a`Tm=|l?F(^VQrr1$f+Qxh*KwwYUG#1xr68Ds3w5KsAF>=-<o@<E#|kiHEs
zNQ4_5BrNq9d$OnMn<#PeZj%ra6##gB%_0a@)E}j3Ha@BVOBiYQaTN&J3lPSj3IrLk
zSpw^JDwl|{HtuJG?Hnc?y#T`a4l-Q`*6xFVA;@@%s0(kTC(HR|@QxS&u2^wsARbln
zTB)&oU5>U2%1TUkmT*yqr9u@A5zI6L$rfb^OZ}v>1_Ux=$CQGQRLLzj30=eu;1H^Y
z<ze?V=`t>o3aRVnH*|(Ewo7C=x@u{k`d~~y`_JPnlSLt^o(T<NE!mb#weo_U2&+UE
zq<9)veQR|R6;T2wY{N9e;kuksP!k^Hgfc{~c+RiA%2Gc?wTX@6(G5)Q>4d1+IC6Z^
tZW!W*N)mo*18|dYa+2*k=qxo{CC7{Tm*mvu+nNfG3=LfDYzP%_`v=<(b3On7

diff --git a/koha-tmpl/opac-tmpl/vanilla/en/images/styles/home-go-button.gif b/koha-tmpl/opac-tmpl/vanilla/en/images/styles/home-go-button.gif
deleted file mode 100644
index aa804430f282b27ab85cd9d5aa9f1a1f984b2a50..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1311
zcmZ?wbhEHblwlBM_|Cwfpf9dqAfad|p=2PbWF)C%EU64cCQ{0#QYt`XCar2Nt!g2y
z21J%J>ejLvKx8AUX(Oj;E2m{Ar)4j%XQQlVtE^|QtnDDL?VzCJsG#GdpzExt>!PR!
zM6OEuZc6&@$_DPr#x80G9?FKEDu!MvMnL4PYV56Q<fCc~M7}_zW&%WhYNr0`Mh+S#
zZW`t;I%fVFW&xV!ftnV9T9!fDR>3-ULHbr9y4E3jHlg}<frfTr26o|wPClkCe&)`B
zX3ildj*&(V5ysBZW-c-2-ods$;dZXE7VfbYZn2gg@z!36cK*qBKFJQgDL~{HobD8m
z<`S6h8kX)7nBf|h=@y;p6`$%KlI0Pa<r$jo6_(>2p6eZx=M|an7oY1JQ{Wd<7#Ld=
z6ki;Yo)?x-5}F7^rD2I>;YnrTSruW)<q^3>(J2*?sTEP_RWUhL5qULH8P&0wwei_?
zi8=L2xj@vAoY#<)*O*e!lvdcBUf!Hi+?rX^mR;YFUDuLX(~(iznO)JDSJ9bY+m&0@
zU0B^yRMS&j+gDQGU)Iu_*V32Q++W<=Q{Ftex_w%0=akCHlWV3;t)DcbYSPT=h4VV+
zFY8;nq-WWhDa+POUAuPDs`b;?t(&rb!_?IqXKmOrXUo>PTei*LwPW7a9gBADT(EQ3
zl70JD9NxYB$etAk53D?NaP_eRD~}&ub>i^qlSkK`KC$WY$*q^pY`c1P+s$*kZeQGU
z>+=4G*A70qap>{Q!;fwreSGuilUv80-9G;M{;4<jPknfF?!)8rpPyd(_Wa7P*EjyW
zx%v0)Ee1m1z<~pVl+a3E@h1x-1H*L&9gqc}JmJ9cpJ6?xjK_ur2b-7uxMP{j>e(+n
z%i&-{;*#kzI+OH{ttez>>lRi%!O;_{;>^Y?ZBg>#!NR5OQ)P?-8V($AXkeT@MbIbo
zrJ#~S#hp2l!q2*=>&5P=VLW`rdz$lM7AdYv%<es%21XBeX}E={DIe`==)I(Ll!H%L
zM!@pKwzantmS|Z<wPZ|CaH#+D=H%t$LTgjl5>1_+9Os>(>DQOBG5Bd)vW!&~gJn|-
z=OhKoS25AT&rVHNFkcrpTf%eN8jqwZ-z^q}uAKamX#$6n7P)W=s|Rh!c*yknh`4UV
z5(B}e<`z~~y&GCLGP&E>xEFbcPk6w<$jH#*WA!X-!N%CF5mWzsI-+@HW%%}%mnFYn
z3#+<!uzWn|oZcs6{^RzBz+$(FTFt9%4s|G0EVwvR#NXnei;$<m!z0209*(S{0TzNC
z`qvpIcPLaXnAj@pXkzHCzez+{FiiUHf@Xf38yA|m7I`qWOUi#saOOGc^6<9Hf(1>d
zIt{iIG;zrN32<w5e^DUHv&Qu!o5svNil<#R?GaSrQp_=6<Xp^h^3ZhMJrhFpuYdU@
z$}{mn6Sqq0)C&h$cohVWo9=mY;S#$-N5O4Q^#u>qxzuMEIC02^d~jf5Vrk%X+$Cb<
w$Rg;Y@N&r{w+{`>+%gSwh1P9Z>Z3P($wn4l@rZ;~JkAA<9@-})L<AVD0TL9~2mk;8

diff --git a/koha-tmpl/opac-tmpl/vanilla/en/images/talking-book.gif b/koha-tmpl/opac-tmpl/vanilla/en/images/talking-book.gif
deleted file mode 100644
index 85f00a0dc926e8d5cc1a482d6b9cff0fc522c4c2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2002
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
Ih6B$31&o7SX#fBK

diff --git a/koha-tmpl/opac-tmpl/vanilla/en/images/tan-dot.gif b/koha-tmpl/opac-tmpl/vanilla/en/images/tan-dot.gif
deleted file mode 100644
index 7ad973a4f0ad9881f3569ae128ddc87b7d5a79f8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 43
ucmZ?wbhEHbWMp7uXkcKtzPjrF|Nn|VSr{3B0y+#p0Fq%~Vsc?*um%A6t_b!3

diff --git a/koha-tmpl/opac-tmpl/vanilla/en/images/tape.gif b/koha-tmpl/opac-tmpl/vanilla/en/images/tape.gif
deleted file mode 100644
index d0d21e22e17d06d37730accae01dc846ed226282..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1059
zcmV+;1l;>aNk%w1VKM+M0OkMy|NsB~{{H>_{rvp=`}_O)`uh3#`S|$w_xJbq_V)Gl
z_4M@g^Yioa^78TV@$m5Q@9*#K?(XgF?d<IA>+9?4>gws~>FDU_=jZ3-<mBVy<Kp7t
z;o;%n;Naii-`?Kd-QC^X+}zvS+t=6E*4Eb5)z#G0)X~w=(9qD&&(F=x&CJZq%gf8k
z%F4&b$HvCS#l^+M#KgnH!@|PCzrVk|y}i7=yt=x&xw*NxxVX2sx3;#nwY9ahw6wFc
zv$3(Uu&}VKtgNc4s;H=_rlzK(q@<&xqoSgsp`oFlpP!qXo0yoGmzS58mX?*3m6MZ`
zk&%&)kB^Ryj)8%JfPjF1e}8*>dv<nqaBy&KZEb67YiVg|WMpJwVq#oeTv%9GQc_Y-
zP*6)tOFut9JUl!*J3Bf$IypHxH#avlG&C|YGA}PLEiEl5C@3Z-CLSIh9UUDS8X6N5
z6A=*+5D*X#4-X6s3=0bj3JMAd2?+)U1_T5I0s;a600960{{R30A^8LW004dfEC2ui
z05SkA000O7fPR95goTEOh>41ejE#<ukdcy;kTY$Un3<ZJoSkiaiceooq@|{(sHv(_
zb9;zUqpGsAs!(KXeTaRYyuF=lV|^rteO1QC$jQpf%vF73!7Cz$ebv_2*xB0K*1>%;
zCK`ps&E@9G*ET60gdODP@a5IPIV&K9AMf$|$<M(&EkY0q@$QNkH+Sy15mSuYHD?DC
zF1&KgU!NW=rVS!!Ov{=yU6N!$L#Ls+hIG(mNzx_F8ZE{wV$>)|L@_IBzPM0g=Api2
z4Xv3`;^K=ME6$)@%t**)6)<dk06Bxr*-2;D&H(Yj229dmGn*D$6UGIWYH_HPFe%Sj
z2`X{_s$p>vX3f{7H2pZ0GsOj(YHHV7ZQG~B+iGZBOp$Xp>>#InYQ!j67ytma%^F%>
z+lNk!8hjcveOycqk{ETWm9UJNnPvc->%>69Smx-OW3#|W1K4nDpl%QMNdqH`UE6t`
zf?4xo3tF|m(Yb|NZOe-_UXhEff|JYCsz0S;)5_(j=;Y))lJQc;=hbUvypVYrQ>kOz
z#|*l`lgEyppbj;phaGv~F;PWI0VEJ<{4|J+MLV!?4}%Um_)Hr_;Gn_>1BF-NIlH_e
zL=7l#KnMsPekczdNBkf|359roLVz^Z*hdpd1aSikdHJD%2{QCBL=sETVk9a}FrmbN
z5kcqxg9(R-umTM|1VMxmSZ1l^mRxpeL=i*?@xu);oWS8BBdj2U4LR`8!<%r%Dd(JX
z@~{IAHORn%31=cAf(a<B(88dE7Ha6Bh_=9j3MiD&BO)4j073{NRBGv^m}Z)32q1i5
dA|;@PD(a}DmTKy$sHUpws;su^Y9xUG06V!F9LWFx

diff --git a/koha-tmpl/opac-tmpl/vanilla/en/images/vanilla-logout-button.gif b/koha-tmpl/opac-tmpl/vanilla/en/images/vanilla-logout-button.gif
deleted file mode 100644
index 1f3859ceb766281984e3190667d696c142f0be4e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3368
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
UU_K}Z<CKdImoGYL!2#$00?)~fZvX%Q

diff --git a/koha-tmpl/opac-tmpl/vanilla/en/includes/crumb-end.inc b/koha-tmpl/opac-tmpl/vanilla/en/includes/crumb-end.inc
deleted file mode 100644
index 37918504b4..0000000000
--- a/koha-tmpl/opac-tmpl/vanilla/en/includes/crumb-end.inc
+++ /dev/null
@@ -1 +0,0 @@
-  </div>
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/vanilla/en/includes/crumb-start.inc b/koha-tmpl/opac-tmpl/vanilla/en/includes/crumb-start.inc
deleted file mode 100644
index 4a87bcf7a6..0000000000
--- a/koha-tmpl/opac-tmpl/vanilla/en/includes/crumb-start.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-  </td>
-  <td width="5"><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width="5" height="1" border="0" alt="" /></td>
-  <td width="35"><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width="35" height="1" border="0" alt="" /></td>
-  <td><div class="crumb"><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width="1" height="35" border="0" align="right" alt="" />
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/vanilla/en/includes/itemtype-image.inc b/koha-tmpl/opac-tmpl/vanilla/en/includes/itemtype-image.inc
deleted file mode 100644
index e0a139e196..0000000000
--- a/koha-tmpl/opac-tmpl/vanilla/en/includes/itemtype-image.inc
+++ /dev/null
@@ -1,45 +0,0 @@
-<TMPL_IF NAME="book">
-<IMG SRC="<TMPL_VAR NAME='themelang'>/images/book.gif" WIDTH="50" HEIGHT="45" BORDER="0">
-</TMPL_IF>
-<TMPL_IF NAME="largeprint">
-<IMG SRC="<TMPL_VAR NAME='themelang'>/images/large-print.gif" WIDTH="50" HEIGHT="45" BORDER="0">
-</TMPL_IF>
-<TMPL_IF NAME="picture">
-<IMG SRC="<TMPL_VAR NAME='themelang'>/images/magazine.gif" WIDTH="50" HEIGHT="45" BORDER="0">
-</TMPL_IF>
-<TMPL_IF NAME="cdrom">
-<IMG SRC="<TMPL_VAR NAME='themelang'>/images/disk.gif" WIDTH="50" HEIGHT="45" BORDER="0">
-</TMPL_IF>
-<TMPL_IF NAME="cassette">
-<IMG SRC="<TMPL_VAR NAME='themelang'>/images/disk.gif" WIDTH="50" HEIGHT="45" BORDER="0">
-</TMPL_IF>
-<TMPL_IF NAME="cd">
-<IMG SRC="<TMPL_VAR NAME='themelang'>/images/disk.gif" WIDTH="50" HEIGHT="45" BORDER="0">
-</TMPL_IF>
-<TMPL_IF NAME="video">
-<IMG SRC="<TMPL_VAR NAME='themelang'>/images/tape.gif" WIDTH="50" HEIGHT="45" BORDER="0">
-</TMPL_IF>
-<TMPL_IF NAME="bag">
-<IMG SRC="<TMPL_VAR NAME='themelang'>/images/book.gif" WIDTH="50" HEIGHT="45" BORDER="0">
-</TMPL_IF>
-<TMPL_IF NAME="magazine">
-<IMG SRC="<TMPL_VAR NAME='themelang'>/images/magazine.gif" WIDTH="50" HEIGHT="45" BORDER="0">
-</TMPL_IF>
-<TMPL_IF NAME="puzzle">
-<IMG SRC="<TMPL_VAR NAME='themelang'>/images/jigsaw.gif" WIDTH="50" HEIGHT="45" BORDER="0">
-</TMPL_IF>
-<TMPL_IF NAME="picturebook">
-<IMG SRC="<TMPL_VAR NAME='themelang'>/images/picture-book.gif" WIDTH="50" HEIGHT="45" BORDER="0">
-</TMPL_IF>
-<TMPL_IF NAME="map">
-<IMG SRC="<TMPL_VAR NAME='themelang'>/images/map.gif" WIDTH="50" HEIGHT="45" BORDER="0">
-</TMPL_IF>
-<TMPL_IF NAME="photograph">
-<IMG SRC="<TMPL_VAR NAME='themelang'>/images/magazine.gif" WIDTH="50" HEIGHT="45" BORDER="0">
-</TMPL_IF>
-<TMPL_IF NAME="talkingbook">
-<IMG SRC="<TMPL_VAR NAME='themelang'>/images/talking-book.gif" WIDTH="50" HEIGHT="45" BORDER="0">
-</TMPL_IF>
-<TMPL_IF NAME="dvd">
-<IMG SRC="<TMPL_VAR NAME='themelang'>/images/dvd.gif" WIDTH="50" HEIGHT="45" BORDER="0">
-</TMPL_IF>
diff --git a/koha-tmpl/opac-tmpl/vanilla/en/includes/koha.css b/koha-tmpl/opac-tmpl/vanilla/en/includes/koha.css
deleted file mode 100644
index fcf15d833c..0000000000
--- a/koha-tmpl/opac-tmpl/vanilla/en/includes/koha.css
+++ /dev/null
@@ -1,161 +0,0 @@
-.heading1
-{font-family:arial,helvetica;font-size:180%;color:#A88050}
-
-.heading1bold
-{font-family:arial,helvetica;font-size:180%;
-font-weight:bold;
-color:#A88050}
-
-
-.heading4 {font-family:arial,helvetica;
-font-size:110%;
-color:#614523;
-font-weight:bold;
-margin-bottom:0px;
-padding-bottom:0px}
-
- input.checkbox
-{font-family:monospace;
-font-size:25px;
-size:25px;
-height:25px;
-width:25px;
-}
-.small {font-size:90%;
-font-family: arial,helvetica;
-margin-bottom:3pt;
-}
-
-.tiny {font-size:x-small;
-font-family: arial,helvetica;
-}
-
-
-.pink{
-background-color:#FEEDDB;
-padding: 5px;
-}
-
-.plain{
-padding: 5px;}
-
-.tan{
-background-color:#A88050;}
-
-.selected{
-color:#C96029;
-font-weight:bold;
-padding: 3px;
-}
-
-.selected-lge{
-color:#C96029;
-font-size:120%;
-font-family: arial,helvetica;
-font-weight:bold;
-padding:3px;
-}
-
-.padded{
-padding: 5px;
-font-size:small;
-}
-
-.dk-brown{
-background-color:#4E300C;}
-
-.green{
-background-color:#E0EBDD;}
-
-.search-number {
-    font-family: verdana,arial,hevetica;
-  font-size: small;
-  font-weight: bold;
-text-decoration: none;
- width: 17px;
-height: 17px;
-padding: 2px;
-border-right: 1px;
-border-bottom: 1px;
-border-left: 1px;
-border-top: 1px;
-  border-style: solid;
-  border-color: #354E27;
-    }
-.selected-number {
-    font-family: verdana,arial,hevetica;
-  font-size: small;
-  font-weight: bold;
-text-decoration: none;
-background-color:#FEEDDB;
- width: 17px;
-height: 17px;
-padding: 2px;
-border-right: 1px;
-border-bottom: 1px;
-border-left: 1px;
-border-top: 1px;
-  border-style: solid;
-  border-color: #354E27;
-    }
-.selected-box {
-   background-color:#E3A46D;
-padding:0px;
-    }
-
-.green-box {
-background-color: #344E26;
-  font-family:verdana,arial,hevetica;
-font-size:small;
-font-weight:bold;
-color: #FEEDDB;
-   border-top: 1px;
-border-right: 1px;
-border-bottom: 1px;
-border-left: 1px;
-padding: 4px;
-  border-style: solid;
-  border-color: #667755;
-    }
-
-.brown-box {
-background-color:#A88050;
-   font-family:verdana,arial,hevetica;
-font-size:small;
-font-weight:bold;
-color: #FEEDDB;
- border-top: 1px;
-border-right: 1px;
-border-bottom: 1px;
-border-left: 1px;
-padding: 4px;
-  border-style: solid;
-  border-color: #817567;
-    }
-.table-heading {
-background-color:#D7AB7A;
-   font-family:verdana,arial,hevetica;
-font-size:small;
-font-weight:bold;
- padding: 5px;
-       }
-.white-box {
-background-color:#ffffff;
-    border-top: 1px;
-border-right: 1px;
-border-bottom: 1px;
-border-left: 1px;
-padding: 0px;
-  border-style: solid;
-  border-color: #4E300E;
-    }
-.fines-box {
-background-color:#E3A46D;
-    border-top: 1px;
-border-right: 1px;
-border-bottom: 1px;
-border-left: 1px;
-padding: 0px;
-  border-style: solid;
-  border-color: #4E300E;
-    }
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/vanilla/en/includes/main.css b/koha-tmpl/opac-tmpl/vanilla/en/includes/main.css
deleted file mode 100644
index 2547e663a5..0000000000
--- a/koha-tmpl/opac-tmpl/vanilla/en/includes/main.css
+++ /dev/null
@@ -1,361 +0,0 @@
-/*
-What is
-*.search-number
-
-*/
-
-*.search-number {
-  border-bottom: 1px;
-  border-color: #354E27;
-  border-left: 1px;
-  border-right: 1px;
-  border-style: solid;
-  border-top: 1px;
-  display: inline;
-  font-family: verdana,arial,hevetica;
-  font-size: small;
-  font-weight: bold;
-  height: 17px;
-  padding: 2px;
-  text-decoration: none;
-  width: 17px;
-}
-
-*.selected-number {
-  background-color: #FEEDDB;
-  border-bottom: 1px;
-  border-color: #354E27;
-  border-left: 1px;
-  border-right: 1px;
-  border-style: solid;
-  border-top: 1px;
-  font-family: verdana,arial,hevetica;
-  font-size: small;
-  font-weight: bold;
-  height: 17px;
-  padding: 2px;
-  text-decoration: none;
-  width: 17px;
-}
-
-a {
-  color: #BF470A;
-  font-weight: bold;
-}
-
-a:visited {
-  color: #BF740A;
-}
-
-a:hover {
-  color: #000000;
-}
-
-a.button:hover {
-  background: transparent;
-  padding: 0;
-}
-
-body {
-  background-color: #FFFFFF;
-  font-family: verdana,arial,helvetica, san-serif;
-  margin: 0px;
-  padding: 0px;
-}
-
-h1 {
-  color: #A88050;
-  font-family: arial,helvetica;
-  font-size: 180%;
-}
-
-h2 {
-  color: #A88050;
-  font-family: arial,helvetica;
-  font-size: 160%;
-  margin-bottom: 0px;
-  padding-bottom: 0px;
-}
-
-h3 {
-  color: #614523;
-  font-family: arial,helvetica;
-  font-size: 130%;
-  margin-bottom: 0px;
-  padding-bottom: 0px;
-}
-
-h4 {
-  color: #614523;
-  font-family: arial,helvetica;
-  font-size: 110%;
-  margin-bottom: 0px;
-  padding-bottom: 0px;
-}
-
-input {
-  font-family: monospace;
-  font-size: 12px;
-}
-
-input.checkbox {
-  font-family: monospace;
-  font-size: 25px;
-  height: 25px;
-  size: 25px;
-  width: 25px;
-}
-
-p,ul,ol,li {
-  font-family: verdana,arial,helvetica;
-  font-size: 12px;
-  line-height: 20px;
-}
-
-td {
-  font-family: verdana,arial,helvetica;
-  font-size: 12px;
-}
-
-.botnav a:link {
-  color: #41622F;
-  font-family: verdana,arial,helvetica;
-  font-size: 10pt;
-  font-weight: normal;
-}
-
-.botnav a:visited {
-  color: #909E88;
-  font-family: verdana,arial,helvetica;
-  font-size: 10pt;
-  font-weight: normal;
-}
-
-.botnav a:hover {
-  background: #E3A46D;
-  color: #000000;
-}
-
-.brown-box {
-  background-color: #A88050;
-  border-bottom: 1px;
-  border-color: #817567;
-  border-left: 1px;
-  border-right: 1px;
-  border-style: solid;
-  border-top: 1px;
-  color: #FEEDDB;
-  font-family: verdana,arial,hevetica;
-  font-size: small;
-  font-weight: bold;
-  padding: 4px;
-}
-
-.crumb {
-  color: #000000;
-  font-weight: normal;
-}
-
-.crumb a:link {
-  color: #41622F;
-  font-weight: normal;
-}
-
-.crumb a:visited {
-  color: #909E88;
-  font-weight: normal;
-}
-
-.crumb a:hover {
-  background: #E3A46D;
-  color: #000000;
-}
-
-.dk-brown{
-  background-color: #4E300C;
-}
-
-.fines-box {
-  background-color: #E3A46D;
-  border-bottom: 1px;
-  border-color: #4E300E;
-  border-left: 1px;
-  border-right: 1px;
-  border-style: solid;
-  border-top: 1px;
-  padding: 0px;
-}
-
-.green{
-  background-color: #E0EBDD;
-}
-
-.green-box {
-  background-color: #344E26;
-  border-bottom: 1px;
-  border-color: #667755;
-  border-left: 1px;
-  border-right: 1px;
-  border-style: solid;
-  border-top: 1px;
-  color: #FEEDDB;
-  font-family: verdana,arial,hevetica;
-  font-size: small;
-  font-weight: bold;
-  padding: 4px;
-}
-
-.head1 {
-  color: #A88050;
-  font-family: arial,helvetica;
-  font-size: 180%;
-}
-
-.head1bold {
-  color: #A88050;
-  color: #A88050;
-  font-family: arial,helvetica;
-  font-size: 180%;
-  font-weight: bold;
-}
-
-.head2{
-  color: #A88050;
-  font-family: arial,helvetica;
-  font-size: 160%;
-  margin-bottom: 0px;
-  padding-bottom: 0px;
-}
-
-.head2bold {
-  color: #A88050;
-  font-family: arial,helvetica;
-  font-size: 160%;
-  font-weight: bold;
-  margin-bottom: 0px;
-  padding-bottom: 0px;
-}
-
-.heading4 {
-  color: #614523;
-  font-family: arial,helvetica;
-  font-size: 110%;
-  font-weight: bold;
-  margin-bottom: 0px;
-  padding-bottom: 0px;
-}
-
-.main {
-  font-family: verdana,arial,helvetica;
-  font-size: 12px;
-}
-
-.navhead {
-  font-weight: bold;
-}
-
-.padded{
-  font-size: 12px;
-  padding: 5px;
-}
-
-.pink{
-  background-color: #FEEDDB;
-  padding: 5px;
-}
-
-.plain{
-  padding: 5px;
-}
-
-.search {
-  font-family: verdana,arial,hevetica;
-  font-size: 7.5pt;
-  font-weight: bold;
-}
-
-.selected{
-  color: #C96029;
-  font-weight: bold;
-  padding: 3px;
-}
-
-.selected-box {
-  background-color: #E3A46D;
-  padding: 0px;
-}
-
-.selected-lge{
-  color: #C96029;
-  font-family: arial,helvetica;
-  font-size: 120%;
-  font-weight: bold;
-  padding: 3px;
-}
-
-.shade{
-  background-color: #DCCAB4;
-  padding: 5px;
-}
-
-.sidenav {
-  color: #41622F;
-  font-size: 9pt;
-  font-weight: normal;
-  line-height: 13px;
-  margin-bottom: 3pt;
-}
-
-.sidenav a:link {
-  color: #41622F;
-  font-size: 9pt;
-  font-weight: normal;
-  line-height: 13px;
-  margin-bottom: 3pt;
-}
-
-.sidenav a:visited {
-  color: #41622F;
-  font-size: 9pt;
-  font-weight: normal;
-  margin-bottom: 3pt;
-}
-
-.sidenav a:hover {
-  background: #E3A46D;
-  color: #000000;
-}
-
-.small {
-  font-family: arial,helvetica;
-  font-size: 90%;
-  margin-bottom: 3pt;
-}
-
-.table-heading {
-  background-color: #D7AB7A;
-  font-family: verdana,arial,hevetica;
-  font-size: small;
-  font-weight: bold;
-  padding: 5px;
-}
-
-.tan{
-  background-color: #A88050;
-}
-
-.tiny {
-  font-family: arial,helvetica;
-  font-size: x-small;
-}
-
-.white-box {
-  background-color: #FFFFFF;
-  border-bottom: 1px;
-  border-color: #4E300E;
-  border-left: 1px;
-  border-right: 1px;
-  border-style: solid;
-  border-top: 1px;
-  padding: 0px;
-}
diff --git a/koha-tmpl/opac-tmpl/vanilla/en/includes/opac.css b/koha-tmpl/opac-tmpl/vanilla/en/includes/opac.css
deleted file mode 100644
index 46dc487720..0000000000
--- a/koha-tmpl/opac-tmpl/vanilla/en/includes/opac.css
+++ /dev/null
@@ -1,222 +0,0 @@
-body {background-color:#ffffff;
-font-family:verdana,arial,helvetica;
-margin:0px;
-padding:0px}
-
-a {color:#41622F;
-}
-
-a:visited {color:#4D300D;
-}
-/*
-blue
-a:visited {color:#10496E}
-*/
-h1 {font-family:verdana,arial,helvetica;
-font-size:180%;
-color:#A88050}
-
-h2 {font-family:verdana,arial,helvetica;
-font-size:160%;
-color:#A88050;
-margin-bottom:0px;
-padding-bottom:0px}
-
-h3 {font-family:verdana,arial,helvetica;
-font-size:130%;
-color:#614523;
-margin-bottom:0px;
-padding-bottom:0px}
-
-.botnav {font-family:verdana,arial,helvetica;
-font-size:10pt;
-color:#41622F;
-}
-
-.botnav a {font-family:verdana,arial,helvetica;
-font-size:10pt;
-color:#41622F;
-}
-
-p {font-family:verdana,arial,helvetica;
-font-size:10pt;
-}
-
-td {font-family:verdana,arial,helvetica;
-font-size:10pt;
-}
-
-ul {font-family:verdana,arial,helvetica;
-font-size:10pt;
-}
-
-ol {font-family:verdana,arial,helvetica;
-font-size:10pt;
-}
-
-li {font-family:verdana,arial,helvetica;
-font-size:10pt;
-}
-
-.main {font-family:verdana,arial,helvetica;
-font-size:10pt;
-}
-
-input {font-family:monospace;
-font-size:12px}
-
-.navhead {font-weight:bold}
-
-.sidenav {font-size:9pt;color:#41622F;
-font-family: arial,helvetica;
-margin-bottom:3pt;
-}
-.small {font-size:9pt;
-font-family: arial,helvetica;
-margin-bottom:3pt;
-}
-
-.tiny {font-size:7pt;
-font-family: arial,helvetica;
-}
-
-.crumb {color:#41622F;
-}
-
-.crumb a:visited {color:#41622F;
-}
-
-.pink{
-background-color:#FEEDDB;
-padding: 5px;
-}
-
-.plain{
-padding: 5px;}
-
-.tan{
-background-color:#A88050;}
-
-.selected{
-color:#C96029;
-font-weight:bold;
-}
-
-.selected-lge{
-color:#C96029;
-font-size:120%;
-font-family: arial,helvetica;
-font-weight:bold;
-}
-
-.padded{
-padding: 2px;}
-
-.dk-brown{
-background-color:#4E300C;}
-
-.search {font-family:verdana,arial,hevetica;
-font-size:7.5pt;
-font-weight:bold}
-
-.search-number {
-    font-family: verdana,arial,hevetica;
-  font-size: 8pt;
-  font-weight: bold;
-text-decoration: none;
- width: 17px;
-height: 17px;
-padding: 2px;
-border-right: 1px;
-border-bottom: 1px;
-border-left: 1px;
-border-top: 1px;
-  border-style: solid;
-  border-color: #354E27;
-    }
-.selected-number {
-    font-family: verdana,arial,hevetica;
-  font-size: 8pt;
-  font-weight: bold;
-text-decoration: none;
-background-color:#FEEDDB;
- width: 17px;
-height: 17px;
-padding: 2px;
-border-right: 1px;
-border-bottom: 1px;
-border-left: 1px;
-border-top: 1px;
-  border-style: solid;
-  border-color: #354E27;
-    }
-.selected-box {
-   background-color:#E3A46D;
-padding:0px;
-    }
-
-.green-box {
-background-color: #344E26;
-  font-family:verdana,arial,hevetica;
-font-size:8pt;
-font-weight:bold;
-color: #FEEDDB;
-   border-top: 1px;
-border-right: 1px;
-border-bottom: 1px;
-border-left: 1px;
-padding: 4px;
-  border-style: solid;
-  border-color: #667755;
-    }
-
-.brown-box {
-background-color:#A88050;
-   font-family:verdana,arial,hevetica;
-font-size:8pt;
-font-weight:bold;
-color: #FEEDDB;
- border-top: 1px;
-border-right: 1px;
-border-bottom: 1px;
-border-left: 1px;
-padding: 4px;
-  border-style: solid;
-  border-color: #817567;
-    }
-.table-heading {
-background-color:#D7AB7A;
-   font-family:verdana,arial,hevetica;
-font-size:12pt;
-font-weight:bold;
- border-top: 2px;
-border-right: 0px;
-border-bottom: 2px;
-border-left: 0px;
-padding: 5px;
-  border-style: solid;
-  border-color: #4E300C;
-    }
-.white-box {
-background-color:#ffffff;
-    border-top: 1px;
-border-right: 1px;
-border-bottom: 1px;
-border-left: 1px;
-padding: 2px;
-  border-style: solid;
-  border-color: #4E300E;
-    }
-.fines-box {
-background-color:#E3A46D;
-    border-top: 1px;
-border-right: 1px;
-border-bottom: 1px;
-border-left: 1px;
-padding: 0px;
-  border-style: solid;
-  border-color: #4E300E;
-    }
-checkbox{
- font-size:160%;
-}
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/vanilla/en/includes/script.js b/koha-tmpl/opac-tmpl/vanilla/en/includes/script.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/koha-tmpl/opac-tmpl/vanilla/en/includes/vanilla-botnav-all.inc b/koha-tmpl/opac-tmpl/vanilla/en/includes/vanilla-botnav-all.inc
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/koha-tmpl/opac-tmpl/vanilla/en/includes/vanilla-cat-search.inc b/koha-tmpl/opac-tmpl/vanilla/en/includes/vanilla-cat-search.inc
deleted file mode 100644
index 4a55c7ab5e..0000000000
--- a/koha-tmpl/opac-tmpl/vanilla/en/includes/vanilla-cat-search.inc
+++ /dev/null
@@ -1,4 +0,0 @@
- <p>&nbsp;</p> <form action="/cgi-bin/koha/opac-searchresults.pl" method="post">
-  <div class="search">Search the Catalogue</div>
-  <input type="text" name="words" size="12" alt="Search the catalogues" />&nbsp;<input type="image" name="Go" src="<TMPL_VAR name='themelang'>/images/styles/home-go-button.gif" alt="Go" align="absmiddle" border="0" />
-  </form>
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/vanilla/en/includes/vanilla-crumb-end.inc b/koha-tmpl/opac-tmpl/vanilla/en/includes/vanilla-crumb-end.inc
deleted file mode 100644
index 37918504b4..0000000000
--- a/koha-tmpl/opac-tmpl/vanilla/en/includes/vanilla-crumb-end.inc
+++ /dev/null
@@ -1 +0,0 @@
-  </div>
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/vanilla/en/includes/vanilla-crumb-start.inc b/koha-tmpl/opac-tmpl/vanilla/en/includes/vanilla-crumb-start.inc
deleted file mode 100644
index f3e81b4ea5..0000000000
--- a/koha-tmpl/opac-tmpl/vanilla/en/includes/vanilla-crumb-start.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-  </td>
-  <td width="5"><img src="/images/holder.gif" width="5" height="1" border="0" alt="" /></td>
-  <td width="35"><img src="/images/holder.gif" width="35" height="1" border="0" alt="" /></td>
-  <td><div class="crumb"><img src="/images/holder.gif" width="1" height="35" border="0" align="right" alt="" />
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/vanilla/en/includes/vanilla-end-main.inc b/koha-tmpl/opac-tmpl/vanilla/en/includes/vanilla-end-main.inc
deleted file mode 100644
index 876355eef2..0000000000
--- a/koha-tmpl/opac-tmpl/vanilla/en/includes/vanilla-end-main.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-  </td><td><img src="/images/holder.gif" width="32" height="1" alt=" "></td></tr>
-</table>
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/vanilla/en/includes/vanilla-key.inc b/koha-tmpl/opac-tmpl/vanilla/en/includes/vanilla-key.inc
deleted file mode 100644
index aa9afb2af1..0000000000
--- a/koha-tmpl/opac-tmpl/vanilla/en/includes/vanilla-key.inc
+++ /dev/null
@@ -1 +0,0 @@
-<br>
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/vanilla/en/includes/vanilla-left-nav.inc b/koha-tmpl/opac-tmpl/vanilla/en/includes/vanilla-left-nav.inc
deleted file mode 100644
index 2e568b6a7c..0000000000
--- a/koha-tmpl/opac-tmpl/vanilla/en/includes/vanilla-left-nav.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-<table border="0" cellpadding="0" cellspacing="0" width="100%">
-<tr valign="top"><td class="sidenav-box">
-
-
-
-
diff --git a/koha-tmpl/opac-tmpl/vanilla/en/includes/vanilla-logout.inc b/koha-tmpl/opac-tmpl/vanilla/en/includes/vanilla-logout.inc
deleted file mode 100644
index d8d2ebb5cf..0000000000
--- a/koha-tmpl/opac-tmpl/vanilla/en/includes/vanilla-logout.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-  <form>
-  
-<input type="submit" name="Log Out" value="Log Out" align="absmiddle" class="submit" />
-  </form>
diff --git a/koha-tmpl/opac-tmpl/vanilla/en/includes/vanilla-main.css b/koha-tmpl/opac-tmpl/vanilla/en/includes/vanilla-main.css
deleted file mode 100644
index b92308b4bf..0000000000
--- a/koha-tmpl/opac-tmpl/vanilla/en/includes/vanilla-main.css
+++ /dev/null
@@ -1,485 +0,0 @@
-/*
-What is
-*.search-number
-
-*/
-
-*.search-number {
-  border-bottom: 1px;
-  border-color: #354E27;
-
-  border-left: 1px;
-  border-right: 1px;
-  border-top: 1px;
-  display: inline;
-  font-family: verdana,arial,hevetica;
-  font-size: small;
-  font-weight: bold;
-  height: 17px;
-  padding: 2px;
-  text-decoration: none;
-  width: 17px;
-}
-
-*.selected-number {
-  background-color: #FEEDDB;
-  border-bottom: 1px;
-  border-color: #354E27;
-  border-left: 1px;
-  border-right: 1px;
-  border-style: solid;
-  border-top: 1px;
-  font-family: verdana,arial,hevetica;
-  font-size: small;
-  font-weight: bold;
-  height: 17px;
-  padding: 2px;
-  text-decoration: none;
-  width: 17px;
-}
-
-a {
-  color: #CC6600;
-  font-weight: bold;
-  
-}
-
-a:visited {
-  color: #3333CC;
-}
-
-a:hover {
-  color: #000000;
-  background-color: D6F96A;
-  
-  
-}
-
-a.button:hover {
-  background: transparent;
-  padding: 0;
-}
-
-body {
-  background-color: #FFFFFF;
-  font-family: verdana,arial,helvetica, san-serif;
-  margin: 0px;
-  padding: 0px;
-}
-
-h1 {
-  color: #663366;
-  font-family: arial,helvetica;
-  font-size: 180%;
-}
-
-.logo h1 {
-  margin-left: 20px;
-  margin-bottom: 4px;
-  margin-top: 4px;
-  color: #D3DFAD;}
-
-
-
-h2 {
-  color: #663366;
-  font-family: arial,helvetica;
-  font-size: 160%;
-  margin-bottom: 0px;
-  padding-bottom: 0px;
-}
-
-h3 {
-  color: #663366;
-  font-family: arial,helvetica;
-  font-size: 130%;
-  margin-bottom: 0px;
-  padding-bottom: 0px;
-}
-
-h4 {
-  color: #663366;
-  font-family: arial,helvetica;
-  font-size: 110%;
-  margin-bottom: 0px;
-  padding-bottom: 0px;
-}
-
-input {
-  font-family: monospace;
-  font-size: 12px;
-}
-
-input.checkbox {
-  font-family: monospace;
-  font-size: 25px;
-  height: 25px;
-  size: 25px;
-  width: 25px;
-}
-
-
-
-
-
-p,ul,ol,li {
-  font-family: verdana,arial,helvetica;
-  font-size: 12px;
-  line-height: 20px;
-}
-
-td {
-  font-family: verdana,arial,helvetica;
-  font-size: 12px;
-}
-
-.botnav a:link {
-  color: #41622F;
-  font-family: verdana,arial,helvetica;
-  font-size: 10pt;
-  font-weight: normal;
-}
-
-.botnav a:visited {
-  color: #909E88;
-  font-family: verdana,arial,helvetica;
-  font-size: 10pt;
-  font-weight: normal;
-}
-
-.botnav a:hover {
-  background-color: #D7E8A5;
-  color: #000000;
-}
-
-.brown-box {
-  background-color: #A88050;
-  border: 1px;
-  border-color: #000000;
-  border-style: solid;
-  color: #FEEDDB;
-  font-family: verdana,arial,hevetica;
-  font-size: small;
-  font-weight: bold;
-  padding: 4px;
-}
-
-.crumb {
-  color: #000000;
-  font-weight: normal;
-}
-
-.crumb a:link {
-  color: #CC9966;
-  font-weight: normal;
-}
-
-.crumb a:visited {
-  color: #666666;
-  font-weight: normal;
-}
-
-.crumb a:hover {
-  background-color: #D6F96A;
-  color: #000000;
-}
-
-.dk-brown{
-  background-color: #A2BB64; D7E8A5; 4E300C;
-}
-
-.fines-box {
-  background-color: #E3A46D;
-  border: 1px;
-  border-style: solid;
-  border-color: #4E300E;
-  
-  padding: 0px;
-}
-
-.green{
-  background-color: #E3A46D;
-}
-
-.green-box {
-  color: #FEEDDB;
-  background-color: #C57619;
-  border: 1px;
-  border-color: #000000;
-  border-style: solid;
-  font-family: verdana,arial,hevetica;
-  font-size: small;
-  font-weight: bold;
-  padding: 4px;
-}
-
-.head1 {
-  color: #663366;
-  font-family: arial,helvetica;
-  font-size: 180%;
-}
-
-.head1bold {
-  color: #663366;
-  font-family: arial,helvetica;
-  font-size: 180%;
-  font-weight: bold;
-}
-
-.head2{
-  color: #663366;
-  font-family: arial,helvetica;
-  font-size: 160%;
-  margin-bottom: 0px;
-  padding-bottom: 0px;
-}
-
-.head2bold {
-  color: #663366;
-  font-family: arial,helvetica;
-  font-size: 160%;
-  font-weight: bold;
-  margin-bottom: 0px;
-  padding-bottom: 0px;
-}
-
-.heading4 {
-  color: #663366;
-  font-family: arial,helvetica;
-  font-size: 110%;
-  font-weight: bold;
-  margin-bottom: 0px;
-  padding-bottom: 0px;
-}
-
-
-.label {
-  padding-right: 12px;
-  padding-bottom: 6px;
-
-}
-
-
-
-
-.line {
-  background-color: #663366; A2BB64; D7E8A5;
-}
-
-
-.opac-menu {
-  background-color: #663366;
-border-top: 0px;
-border-left: 0px;
-border-right: 0px;
-  border-bottom: 1px;
-  border-color: #000000;
-  border-style: solid;
-  margin: 0px;  
-}
-
-
-
-.main {
-  font-family: verdana,arial,helvetica;
-  font-size: 12px;
-}
-
-.menu {
-  margin-right: 10px;
-  color: #CCCC99;
-}
-
-
-.menu a:link {
-  color: #CCFF66;
-}
-
-.menu a:visited {
-  color: #E6E6CD;
-}
-
-.menu a:hover {
-  color: #000000;
-  background: EDF8CD;
-}
-
-
-.navhead {
-  font-weight: bold;
-  margin-top: 10px;
-  margin-bottom: 0px;
-}
-
-.navhead a:hover {
-  color: #000000;
-  background: ffffff;
-}
-
-
-.padded{
-  font-size: 12px;
-  line-height: 20px;
-  padding: 5px;
-
-}
-
-.pink{
-  background-color: #EDF8CD;
-  line-height: 20px;
-  margin-left: 5px;
-
-}
-
-.plain{
-  line-height: 20px;
-  margin-left: 5px;
-}
-
-.reset {
-  background-color: #A88050;
-  border: 1px;
-  border-color: #000000;
-  border-style: solid;
-  color: #FEEDDB;
-  font-family: verdana,arial,hevetica;
-  font-size: small;
-  font-weight: bold;
-  padding: 4px;
-}
-
-
-.search {
-  font-family: verdana,arial,hevetica;
-  font-size: 7.5pt;
-  font-weight: bold;
-}
-
-.selected{
-  color: #C96029;
-  font-weight: bold;
-  padding: 3px;
-}
-
-.selected-box {
-  background-color: #E3A46D;
-  padding: 0px;
-}
-
-.selected-lge{
-  color: #C96029;
-  font-family: arial,helvetica;
-  font-size: 120%;
-  font-weight: bold;
-  padding: 3px;
-}
-
-.shade{
-  background-color: #DCCAB4;
-  padding: 5px;
-}
-
-
-.shaded{
-  background-color: #EDF8CD;
-  padding: 5px;
-}
-
-
-
-.sidenav-box {
-  background-color: #C3DC76;
-  padding-left: 20px;  
-  padding-right: 4px;  
-  border-bottom: 1px;
-  border-top: 1px;
-  border-left: 0px;
-  border-right: 1px;
-  border-color: #A2BB64; 
-  border-style: solid;
-  
-  
-}
-
-.sidenav ul {
-  list-style-image: url(/images/styles/nav-dot.gif);
-  list-style-position: outside;
-  list-style-type: disc;
-  margin-left: 16px;
-  margin-top: 2px;
-  padding-left: 0px;
-  padding-top: 2px;
-
-  font-size: 9pt;
-  font-weight: normal;
-  line-height: 13px;
-  margin-bottom: 3pt;
-}
-
-
-.sidenav a:hover {
-  background: #ffffff;
-  color: #000000;
-}
-
-.small {
-  font-family: arial,helvetica;
-  font-size: 90%;
-  margin-bottom: 3pt;
-}
-
-.submit {
-  color: #FEEDDB;
-  background-color: #C57619;
-  border: 1px;
-  border-color: #000000;
-  border-style: solid;
-  font-family: verdana,arial,hevetica;
-  font-size: small;
-  font-weight: bold;
-  padding: 4px;
-}
-
-submit {
-  color: #FEEDDB;
-  background-color: #C57619;
-  border: 1px;
-  border-color: #000000;
-  border-style: solid;
-  font-family: verdana,arial,hevetica;
-  font-size: small;
-  font-weight: bold;
-  padding: 4px;
-}
-
-
-
-
-.table-heading {
-  background-color: #D7E8A5;
-  font-family: verdana,arial,hevetica;
-  font-size: small;
-  font-weight: bold;
-  padding: 5px;
-}
-
-.tan{
-  background-color: #A2BB64; D7E8A5;
-}
-
-.tiny {
-  font-family: arial,helvetica;
-  font-size: x-small;
-}
-
-.white-box {
-  background-color: #FFFFFF;
-  border-bottom: 1px;
-  border-left: 1px;
-  border-right: 1px;
-  border-top: 1px;
-  border-style: solid;
-border-color: #4E300E;
-  
-  padding: 0px;
-}
diff --git a/koha-tmpl/opac-tmpl/vanilla/en/includes/vanilla-member-menu.inc b/koha-tmpl/opac-tmpl/vanilla/en/includes/vanilla-member-menu.inc
deleted file mode 100644
index 4a1b426491..0000000000
--- a/koha-tmpl/opac-tmpl/vanilla/en/includes/vanilla-member-menu.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-<table class="opac-menu" width="100%" border=0>
-<TR class="opac-background">
-
-<td><div class="logo"><h1>KOHA: Membership</h1></div></td>
-
-
-<td align=right>
-<TMPL_INCLUDE name="vanilla-menu.inc"></td>
-</tr>
-
-
-</table>
-<p>
-
diff --git a/koha-tmpl/opac-tmpl/vanilla/en/includes/vanilla-membership-botnav.inc b/koha-tmpl/opac-tmpl/vanilla/en/includes/vanilla-membership-botnav.inc
deleted file mode 100644
index f4cdd26986..0000000000
--- a/koha-tmpl/opac-tmpl/vanilla/en/includes/vanilla-membership-botnav.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-<br />In this Section: | <a href="/cgi-bin/koha/opac-membership.pl">Membership</a> 
-| <a href="/cgi-bin/koha/opac-user.pl">My Account</a> 
-| <a href="/cgi-bin/koha/opac-readingrecord.pl">Reading Record</a> 
-| <a href="/cgi-bin/koha/opac-userdetails.pl">Personal Details</a> |<!--+Katipo+end--><br />&nbsp;</p>
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/vanilla/en/includes/vanilla-membership-left-nav.inc b/koha-tmpl/opac-tmpl/vanilla/en/includes/vanilla-membership-left-nav.inc
deleted file mode 100644
index f26b6afcaf..0000000000
--- a/koha-tmpl/opac-tmpl/vanilla/en/includes/vanilla-membership-left-nav.inc
+++ /dev/null
@@ -1,64 +0,0 @@
-<div class="navhead"><a href="/membership/">Membership</a></div>
-<div class="sidenav">
-
-<TMPL_IF NAME="loggedinuser">
-<ul>
-<li><a href="/cgi-bin/koha/opac-user.pl">My Home</a></li>
-
-<li><a href="/cgi-bin/koha/opac-account.pl">My Account</a></li>
-
-<li><a href="/cgi-bin/koha/opac-readingrecord.pl">Reading Record</a></li>
-
-<li><a href="/cgi-bin/koha/opac-userdetails.pl">Personal Details</a></li>
-</ul>
-
-<p>&nbsp;<p>
-<TMPL_LOOP NAME="USER_INFO">
-
-   <B> <TMPL_VAR NAME="firstname"> <TMPL_VAR NAME="surname"></B></br>
-
-<TMPL_IF NAME="emailaddress">
-
-    <A HREF='mailto:<TMPL_VAR NAME="emailaddress">'><TMPL_VAR NAME="emailaddress"></A></br>
-
-</TMPL_IF>
-<TMPL_IF NAME="streetaddress">
-    <TMPL_VAR NAME="streetaddress"></br>
-
-</TMPL_IF>
-<TMPL_IF NAME="suburb">
-    <TMPL_VAR NAME="suburb"></br>
-
-</TMPL_IF>
-<TMPL_IF NAME="city">
-    <TMPL_VAR NAME="city"></br>
-
-</TMPL_IF>
-<TMPL_IF NAME="phone">
-    <TMPL_VAR NAME="phone"></br>
-
-</TMPL_IF>
-</TMPL_LOOP>
-
- >><A HREF="/cgi-bin/koha/opac-userupdate.pl" class="sidenav">Edit Details</A>
-
-</div>
-
-<form action="/cgi-bin/koha/opac-main.pl" method="post">
-  <input type="hidden" name="logout.x" value="1">
-  <input type="submit" name="logout" value="logout" class="submit" />
-</form>
-
-<TMPL_ELSE>
-
-<form action="/cgi-bin/koha/opac-user.pl" method="post">
-  <div class="main">Members can sign in here:
-  <br />Cardnumber:
-  <br /><input type="text" name="userid" size="10" />
-  <br />Password:
-  <br /><input type="password" name="password" size="10" />&nbsp;&nbsp;
-  <input type="image" name="Go" src="<TMPL_VAR NAME='themelang'>/images/styles/home-go-button.gif" alt="Go" align="absmiddle" border="0" /></div>
-</form>
-
-
-</TMPL_IF>
diff --git a/koha-tmpl/opac-tmpl/vanilla/en/includes/vanilla-menu.inc b/koha-tmpl/opac-tmpl/vanilla/en/includes/vanilla-menu.inc
deleted file mode 100644
index ebdc4d2361..0000000000
--- a/koha-tmpl/opac-tmpl/vanilla/en/includes/vanilla-menu.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="menu"><a href="/cgi-bin/koha/opac-search.pl">Search</a>  |  
-<a href="/cgi-bin/koha/opac-membership.pl">Membership</a>  | 
-<a href="/cgi-bin/koha/opac-main.pl">Home</a>
-
-</div>
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/vanilla/en/includes/vanilla-personal-details.inc b/koha-tmpl/opac-tmpl/vanilla/en/includes/vanilla-personal-details.inc
deleted file mode 100644
index 35691231cc..0000000000
--- a/koha-tmpl/opac-tmpl/vanilla/en/includes/vanilla-personal-details.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="sidenav"><B> Finlay Thomson</B>
-<br>
-<A HREF="mailto:finlay@katipo.co.nz">finlay@katipo.co.nz</A>
-<br>123 Some St
-<br>York By
-<br>Eastbourne
-<br>Ph 123 4567
-<p>
-
->><A HREF="http://hlt-edit.katipo.co.nz/kaka/membership/account.html">Edit Details</A>
-</div>
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/vanilla/en/includes/vanilla-search-menu.inc b/koha-tmpl/opac-tmpl/vanilla/en/includes/vanilla-search-menu.inc
deleted file mode 100644
index 6306d37501..0000000000
--- a/koha-tmpl/opac-tmpl/vanilla/en/includes/vanilla-search-menu.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-<table class="opac-menu" width="100%" border=0>
-<TR class="opac-background">
-
-<td><div class="logo"><h1>KOHA: Catalogue Search</h1></div></td>
-
-
-<td align=right>
-<TMPL_INCLUDE name="vanilla-menu.inc"></td>
-</tr>
-
-
-</table>
-<p>
-
diff --git a/koha-tmpl/opac-tmpl/vanilla/en/loggedin.tmpl b/koha-tmpl/opac-tmpl/vanilla/en/loggedin.tmpl
deleted file mode 100644
index 77d8e1d762..0000000000
--- a/koha-tmpl/opac-tmpl/vanilla/en/loggedin.tmpl
+++ /dev/null
@@ -1,62 +0,0 @@
-<TMPL_IF NAME="loggedinuser">
-
-
-<div class="navhead"><a href="/membership/">Membership</a></div>
-<div class="sidenav">
-<ul>
-<li><a href="/cgi-bin/koha/opac-user.pl">My Home</a>
-<li><a href="/cgi-bin/koha/opac-account.pl">My Account</a>
-<li><a href="/cgi-bin/koha/opac-readingrecord.pl">Reading Record</a>
-<li><a href="/cgi-bin/koha/opac-userdetails.pl">Personal Details</a></ul>
-
-
-<p> &nbsp</p>
-<B><TMPL_VAR NAME="firstname"> <TMPL_VAR NAME="surname"></B></br>
-
-<TMPL_IF NAME="emailaddress">
-<A HREF='mailto:<TMPL_VAR NAME="emailaddress">'><TMPL_VAR NAME="emailaddress"></A></br>
-
-</TMPL_IF>
-<TMPL_IF NAME="streetaddress">
-
-<TMPL_VAR NAME="streetaddress"></br>
-
-</TMPL_IF>
-<TMPL_IF NAME="suburb">
-<TMPL_VAR NAME="suburb"></br>
-
-</TMPL_IF>
-<TMPL_IF NAME="city">
-
-<TMPL_VAR NAME="city">
-</br>
-
-</TMPL_IF>
-<TMPL_IF NAME="phone">
-<TMPL_VAR NAME="phone"></br>
-
-</TMPL_IF>
-</TMPL_LOOP>
-
- >> <A HREF="/cgi-bin/koha/opac-userupdate.pl" class="sidenav">Edit Details</A>
-
-</div>
-
-<form action="/cgi-bin/koha/opac-main.pl" method="post">
-  <input type="submit" name="logout" value="Log Out" class="submit" />
-</form>
-<TMPL_ELSE>
-
-<form action="/cgi-bin/koha/opac-user.pl" method="post">
-  <div class="main">Members can sign in here:
-  <br />Cardnumber:
-  <br /><input type="text" name="userid" size="10" />
-  <br />Password:
-  <br /><input type="password" name="password" size="10" />&nbsp;&nbsp;
-  <input type="image" name="Go" src="<TMPL_VAR NAME='themelang'>/images/styles/home-go-button.gif" alt="Go" align="absmiddle" border="0" /></div>
-</form>
-
-
-</TMPL_IF>
- 
-
diff --git a/koha-tmpl/opac-tmpl/vanilla/en/opac-account.tmpl b/koha-tmpl/opac-tmpl/vanilla/en/opac-account.tmpl
deleted file mode 100644
index 7c9716dc45..0000000000
--- a/koha-tmpl/opac-tmpl/vanilla/en/opac-account.tmpl
+++ /dev/null
@@ -1,92 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<!--
-
-design and HTML by rachel@katipo.co.nz, 
-templating by finlay@katipo.co.nz
-
-ACCOUNT PAGE
-
-This is the part of the "vanilla" theme put together by Katipo Communications for general distribution with Koha. 
-
-The text about how to join the library comes from Horowhenua Library Trust, (www.library.org.nz) and is provided as a guide to the sort of information you might want to have on this page.  Please change  it to suit your own condititions.
-
-If you see strange tags and comments you don't understand they may be out of Kea our content management system. If you'd like to use Kea to change your template & website text please contact Katipo.
-
-Cheers
-R
-
-12/1/03
-
--->
-<html>
-<head>
-<title>Account Details</title>
-<link rel="stylesheet" href="<TMPL_VAR NAME='themelang'>/includes/vanilla-main.css" type="text/css" />
-<script type="text/javascript" language="javascript">
-<TMPL_INCLUDE name="script.js">
-</script>
-</head>
-<body marginheight="0" marginwidth="0">
-
-
-<!--START TOP TABLE-->
-<TMPL_INCLUDE name="vanilla-member-menu.inc">
-<!--START MAIN TABLE AND LEFT NAVIGATION-->
-<TMPL_INCLUDE name="vanilla-left-nav.inc">
-<TMPL_INCLUDE name="vanilla-membership-left-nav.inc">
-
-<!--SEARCH FORM-->
-<TMPL_INCLUDE name="vanilla-cat-search.inc">
-<!--END LEFT NAV, START CRUMBS-->
-<TMPL_INCLUDE name="vanilla-crumb-start.inc">	
-<a href="/">Home</a> &gt;<a href='/membership/'>Membership</a> &gt;<a href='/cgi-bin/koha/opac-account.pl'>My Account</a>
-<!--END CRUMBS-->
-<TMPL_INCLUDE name="vanilla-crumb-end.inc">
-<!--CONTENT-->
-
-<TMPL_LOOP NAME="BORROWER_INFO">
-<h1>Account for <TMPL_VAR NAME="firstname"> <TMPL_VAR NAME="surname"></h1>
-</TMPL_LOOP>
-<p>
-
-<table border=0 cellspacing=0 cellpadding=0>
-<tr>
-<td colspan="5" class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td></tr>
-<tr class="table-heading"><td colspan="2"><b>Fines & Charges</b></td>
-<td><b>Amount</b></td>
-<td>&nbsp</td>
-<td><b>Still Owing</b></td>
-<tr><td colspan="5" class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td></tr>
-
-
-<TMPL_LOOP NAME="ACCOUNT_LINES">
-
-<tr valign=top class=<TMPL_IF NAME="odd">"plain"<TMPL_ELSE>"shaded"</TMPL_IF>>
-<td class="padded"><TMPL_VAR NAME="date"></td>
-<td class="padded"><TMPL_VAR NAME="description">
-<TMPL_IF NAME="print_title"><TMPL_VAR NAME="title"></TMPL_IF></td>
-<td class="padded">$<TMPL_VAR NAME="amount"></td>
-<td>&nbsp</td>
-<td class="padded"><TMPL_IF NAME="amountoutstanding">$<TMPL_VAR NAME="amountoutstanding"><TMPL_ELSE>&nbsp</TMPL_IF></td></tr>
-</TMPL_LOOP>
-
-<tr><td colspan="5" class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td></tr>
-
-<tr VALIGN=TOP >
-<TD>&nbsp</td>
-<TD colspan=3><b>Total Due</b></td>
-<TD><b><TMPL_IF NAME="total">$<TMPL_VAR NAME="total"><TMPL_ELSE>&nbsp</TMPL_IF></b></td>
-</tr>
-<tr><td colspan="5" class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td></tr>
-
-</table>
-
-
-<!--BOTTOM NAVIGATION - ALL-->
-<TMPL_INCLUDE name="vanilla-botnav-all.inc">
-<!--BOTTOM NAVIGATION - SECTION-->
-<TMPL_INCLUDE name="vanilla-membership-botnav.inc">
-<!--END MAIN TABLE-->
-<TMPL_INCLUDE name="vanilla-end-main.inc">
-</body>
-</html>
diff --git a/koha-tmpl/opac-tmpl/vanilla/en/opac-auth.tmpl b/koha-tmpl/opac-tmpl/vanilla/en/opac-auth.tmpl
deleted file mode 100644
index 748035d970..0000000000
--- a/koha-tmpl/opac-tmpl/vanilla/en/opac-auth.tmpl
+++ /dev/null
@@ -1,106 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<!--
-
-design and HTML by rachel@katipo.co.nz, 
-templating by finlay@katipo.co.nz
-
-OPAC AUTHORISATION/LOGIN
-
-This is the part of the "vanilla" theme put together by Katipo Communications for general distribution with Koha. 
-
-The text about how to join the library comes from Horowhenua Library Trust, (www.library.org.nz) and is provided as a guide to the sort of information you might want to have on this page.  Please change  it to suit your own condititions.
-
-If you see strange tags and comments you don't understand they may be out of Kea our content management system. If you'd like to use Kea to change your template & website text please contact Katipo.
-
-Cheers
-R
-
-12/1/03
-
--->
-
-<html>
-<head>
-<title>Login</title>
-<link rel="stylesheet" href="<TMPL_VAR NAME='themelang'>/includes/vanilla-main.css" type="text/css" />
-<script type="text/javascript" language="javascript">
-<TMPL_INCLUDE name="script.js">
-</script>
-</head>
-<body marginheight="0" marginwidth="0">
-<!--START TOP TABLE-->
-<TMPL_INCLUDE name="vanilla-member-menu.inc">
-
-<!--START MAIN TABLE AND LEFT NAVIGATION-->
-<TMPL_INCLUDE name="vanilla-left-nav.inc">
-<TMPL_INCLUDE name="vanilla-membership-left-nav.inc">
-<!--SEARCH FORM-->
-<TMPL_INCLUDE name="vanilla-cat-search.inc">
-<!--END LEFT NAV, START CRUMBS-->
-<TMPL_INCLUDE name="vanilla-crumb-start.inc">	
-<a href="/">Home</a> &gt;<a href='/cgi-bin/koha/opac-user.pl'>Login</a>
-<!--END CRUMBS-->
-<TMPL_INCLUDE name="vanilla-crumb-end.inc">
-<!--CONTENT--><P>
-
-
-
-
-
-
-<TMPL_IF NAME="nopermission">
-<!-- This is what is displayed if user doesnt have permission -->
-<h3>Sorry, KOHA doesnt think you have permission for this page. </h3>
-</TMPL_IF>
-
-<TMPL_IF NAME="timed_out">
-<!-- This is what is displayed if login has timed out -->
-<h3>Sorry, your session has timed out, please login again.</h3>
-</TMPL_IF>
-
-<TMPL_IF NAME="different_ip">
-<!-- This is what is displayed if user doesnt have permission -->
-<h3>You are accessing koha from a different ip address, please login again.</h3>
-</TMPL_IF>
-
-<TMPL_IF NAME="invalid_username_or_password">
-<!-- This is what is displayed if user doesnt have permission -->
-<h3>You entered an incorrect username or password, please try again, usernames and passwords are case sensitive.</h3>
-</TMPL_IF>
-
-
-<TMPL_IF NAME="loginprompt">
-<!-- login 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 cellpadding=0 cellspacing=5 border=0>
-<TR VALIGN=TOP>
-<TD>Your card number</TD> <TD><INPUT TYPE="text"  SIZE="25"   NAME="userid"></TD></TR>
-<TR VALIGN=TOP>
-<TD>Password</TD> <TD><INPUT TYPE="password"  SIZE="25"   NAME="password"></TD>
-</tr><tr>
-<td colspan=2 align="right"><input type="submit" value="OK" SIZE="2"   class="submit"></td>
-</TR>
-</table></form>
-<p>If you don't have a password yet, next time you're in the library, take your card and some I.D. to the information counter and we'll happily issue you one.
-
-
-
-</TMPL_IF>
-
-
-
-<!--+Katipo+end-->
-<!--BOTTOM NAVIGATION - ALL-->
-<TMPL_INCLUDE name="vanilla-botnav-all.inc">
-<!--BOTTOM NAVIGATION - SECTION-->
-<TMPL_INCLUDE name="vanilla-membership-botnav.inc">
-<!--END MAIN TABLE-->
-<TMPL_INCLUDE name="vanilla-end-main.inc">
-</body>
-</html>
diff --git a/koha-tmpl/opac-tmpl/vanilla/en/opac-detail.tmpl b/koha-tmpl/opac-tmpl/vanilla/en/opac-detail.tmpl
deleted file mode 100644
index 880ba6c10f..0000000000
--- a/koha-tmpl/opac-tmpl/vanilla/en/opac-detail.tmpl
+++ /dev/null
@@ -1,143 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<!--
-
-design and HTML by rachel@katipo.co.nz, 
-templating by finlay@katipo.co.nz
-
-SEARCH RESULTS - ITEM DETAIL PAGE
-
-This is the part of the "vanilla" theme put together by Katipo Communications for general distribution with Koha. 
-
-
-If you see strange tags and comments you don't understand they may be out of Kea our content management system. If you'd like to use Kea to change your template & website text please contact Katipo.
-
-Cheers
-R
-
-12/1/03
-
--->
-
-<html>
-<head>
-<title>Details</title>
-<link rel="stylesheet" href="<TMPL_VAR NAME='themelang'>/includes/vanilla-main.css" type="text/css" />
-<script type="text/javascript" language="javascript">
-<TMPL_INCLUDE name="script.js">
-</script>
-</head>
-<body marginheight="0" marginwidth="0">
-
-<!--START TOP TABLE-->
-<TMPL_INCLUDE name="vanilla-search-menu.inc">
-<!--START MAIN TABLE AND LEFT NAVIGATION-->
-<TMPL_INCLUDE name="vanilla-left-nav.inc">
-<!--SEARCH FORM-->
-<TMPL_INCLUDE name="vanilla-cat-search.inc">
-<!--END LEFT NAV, START CRUMBS-->
-<TMPL_INCLUDE name="vanilla-crumb-start.inc">	
-<a href="/">Home</a> &gt;<a href='/cgi-bin/koha/opac-search.pl'>Searching</a> &gt;<a href='/cgi-bin/koha/opac-detail.pl?bib=<TMPL_VAR NAME="biblionumber">'>Details</a>
-<!--END CRUMBS-->
-<TMPL_INCLUDE name="vanilla-crumb-end.inc">
-<!--CONTENT--><P>
-
-<TMPL_LOOP NAME="BIBLIO_RESULTS">
-<table border="0" cellspacing="0" cellpadding="3"><tr><td valign="top">
-<table border="0" cellspacing="0" cellpadding="3"><tr>
-<td valign="top" class="head1bold" colspan=2><TMPL_VAR NAME="title"><br/>
- (<TMPL_VAR NAME="author">)</td>
-</tr>
-</table>
-<P><table border="0" cellspacing="0" cellpadding="2">
-<TMPL_IF NAME="subtitle">
-  <tr> 
-    <td VALIGN="TOP"><B>Subtitle:</B> </TD>
-    <TD VALIGN="TOP"><TMPL_VAR NAME="subtitle"></td>
-  </tr>
-</TMPL_IF>
-  <tr>
-    <td VALIGN="TOP"><B>Copyright:</B> </TD>
-    <TD VALIGN="TOP"><TMPL_VAR NAME="copyrightdate"></td>
-  </tr>
-  <TMPL_IF NAME="subjects">
-  <tr>
-    <td VALIGN="TOP"><B>Subject:</B> </TD>
-    <TD VALIGN="TOP"><TMPL_LOOP NAME="subjects"><a href="/cgi-bin/koha/opac-searchresults.pl?subjectitems=<TMPL_VAR NAME="subject" ESCAPE="URL">"><TMPL_VAR NAME="subject"> </a>|</TMPL_LOOP></td>
-  </tr>
-  </TMPL_IF>
-  <tr>
-    <td VALIGN="TOP"><B>Biblio Record:</B> </TD>
-    <TD VALIGN="TOP"><TMPL_VAR NAME="biblionumber"></td>
-  </tr>
-</table>
-</td>
-<TMPL_UNLESS NAME="norequests">
-<TD valign="top">
-    <form action="/cgi-bin/koha/opac-reserve.pl" method=post>
-    <INPUT TYPE="submit" name="submit"  VALUE="Place Reserve" align=right class="submit">
-    <input type=hidden name=bib value=<TMPL_VAR NAME="biblionumber">>
-    </form>
-</TD>
-</TMPL_UNLESS>
-</tr></table>
-</TMPL_LOOP>
-<P>
-
-<H2>Holdings Information</H2>
-<table border=0 cellspacing=0 cellpadding=0>
-<!--HOLDINGS INFORMATION HEADER TABLE ROWS-->
-<tr><td colspan="12" ><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="10" BORDER="0" ALT=""></td></tr>
-<tr><TD>&nbsp;</TD>
-<td valign="top"><div class="padded"><B>Type/Format</B></div></td>
-<td class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td>
-
-<td valign="top" ><div class="padded"><B>Class</B></div></td>
-
-<td class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td>
-
-<td valign="top"><div class="padded"><B>Location</B></div></td>
-
-<td class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td>
-
-<td valign="top" ><div class="padded"><B>Due Date</B></div></td>
-<td class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td>
-
-
-<td valign="top" ><div class="padded"><B>Last Seen</B></div></td>
-
-<td class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td>
-
-
-<td valign="top" ><div class="padded"><B>Barcode</B></div></td></tr>
-<!--LINE-->
-<tr><td colspan="12" class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td></tr>
-
-<TMPL_LOOP NAME="ITEM_RESULTS">
-<!--INFORMATION ROWS-->
-<tr><td valign="top"><TMPL_INCLUDE NAME="itemtype-image.inc"></td>
-<td valign="top"><div class="padded"><TMPL_VAR NAME="description"></div></td>
-<td class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td>
-<td valign="top"><div class="padded"><TMPL_VAR NAME="class"></div></td>
-<td class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td>
-<td valign="top"><div class="padded"><TMPL_VAR NAME="branchname"></div></td>
-<td class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td>
-<td valign="top"><div class="padded"><TMPL_VAR NAME="datedue"></div></td>
-<td class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td>
-<td valign="top"><div class="padded"><TMPL_VAR NAME="datelastseen"></div></td>
-<td class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td>
-<td valign="top"><div class="padded"><TMPL_VAR NAME="barcode"></div></td></tr>
-</TMPL_LOOP>
-
-</table>
-<P>
-
-<!--+Katipo+end-->
-<!--BOTTOM NAVIGATION - ALL-->
-<TMPL_INCLUDE name="vanilla-botnav-all.inc">
-<!--BOTTOM NAVIGATION - SECTION-->
-
-<!--END MAIN TABLE-->
-<TMPL_INCLUDE name="vanilla-end-main.inc">
-</body>
-</html>
-
diff --git a/koha-tmpl/opac-tmpl/vanilla/en/opac-main.tmpl b/koha-tmpl/opac-tmpl/vanilla/en/opac-main.tmpl
deleted file mode 100644
index 3481acff81..0000000000
--- a/koha-tmpl/opac-tmpl/vanilla/en/opac-main.tmpl
+++ /dev/null
@@ -1,166 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-
-
-<html>
-<title>WELCOME TO THE  KOHA OPAC (Online Public Access Catalogue) </title>
-<style type="text/css">
-<!--
-input {font-size:16px;
-      }
-
-input.ok  {
-  background-color: #CCBBCC;
-  font-family: arial, helvetica, sans-serif;
-  font-size: 14px;
-  font-weight: bold;
-  margin-bottom: 1px;
-  margin-top: 4px;
-  text-align: center;
-}
-
-.search-heading {
-  background-image: url(<TMPL_VAR NAME='themelang'>/images/heading-search-3.gif);
-  no-repeat;
-width: 350 ;
-  height: 38;
-   
-}
-
-.login-heading {
-  background-image: url(<TMPL_VAR NAME='themelang'>/images/heading-login-2.gif);
-  no-repeat;
-width: 350 ;
-  height: 38;
-   
-}
-
-
-h1 {
-  font-family: arial narrow, arial, helvetica, sans-serif;
-  font-size: 25px;
-  font-weight: normal;
-  margin-bottom: 0px;
-  padding-top: 5px;
-  
-  
-
-  }
-  
-
--->
-
-</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 BGCOLOR="#339999" >
-<tr valign=top >
-<td background="<TMPL_VAR NAME='themelang'>/images/front-background-med.gif">
-<img src="<TMPL_VAR NAME='themelang'>/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=" " width=228 height=88 ><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=228 height=88 
-alt=" " hspace=0 vspace=0></td>
-<td background=" " width=57 height=88 ><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=57 height=88 
-alt=" " hspace=0 vspace=0></td>
-<td background=" " width=42 height=88 ><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=42 height=88 
-alt=" " hspace=0 vspace=0 border=0></td>
-<td background=" "><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=1 height=88 
-alt=" " hspace=0 vspace=0></td>
-<td background=" "><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width="220" height=88 
-alt=" " hspace=0 vspace=0></td>
-</tr>
-
-<tr valign=top >
-<td background=" " rowspan=4 align="right" colspan=2><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif"
-width=1 height=30
-alt=" " hspace=0 vspace=0><br>
-<img src="<TMPL_VAR NAME='themelang'>/images/koha.gif" width=200 height=128
-alt="Koha: Public Catalogue and Member Services" hspace=0 vspace=0></td>
-
-<td background=" "  colspan=3 ><div class="search-heading"><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width="38" height="38" alt=" " align="left" ><h1>Search Catalogue</h1></div></td>
-
-</tr>
-
-
-<tr valign=top >
-<td></td>
-<form ACTION="/cgi-bin/koha/opac-searchresults.pl" name=catsearch>
-<input type=hidden name=type value=opac>
-<td background=" " colspan="2">
-
-<input type=text size="20" name="keyword">  <input type="submit" value="OK" class="ok"><br>
-</font>
-<a href="/cgi-bin/koha/opac-search.pl">
-<img src="<TMPL_VAR NAME='themelang'>/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="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=1 height=8
-alt=" " hspace=0 vspace=0></td>
-</form>
-</tr>
-
-
-<TMPL_IF NAME="loggedinuser">
-<tr valign=top ><td background=" "  colspan=3><div class="login-heading"><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width="38" height="38" alt=" " align="left" ><h1>Logged in as </h1></div></td></tr>
-
-<TMPL_LOOP NAME="USER_INFO">
-<tr valign=top ><td></td><td>
- <TMPL_VAR NAME="title"> <TMPL_VAR NAME="firstname"> <TMPL_VAR NAME="surname">
-</td></tr>
-</TMPL_LOOP>
-<tr valign=top ><td></td><td><form method="post">
-<input type="submit" name="logout" value="Log Out" align="absmiddle" border="0" />
-</form></td></tr>
-<TMPL_ELSE>
-
-  <tr valign=top ><form action="/cgi-bin/koha/opac-user.pl" method=post >
-<td background=" "  colspan=3><div class="login-heading"><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width="38" height="38" alt=" " align="left" ><h1>Member Login</h1></div></td>
-
-</tr>
-<tr valign=top >
-<td></td>
-
-<td background=" " >
-<font size=3 face="arial narrow,arial,helvetica">Card Number &nbsp;</font></td>
-<td background=" " ><input type=text size="12" name="userid"></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" class="ok"><br>
-
-<img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=1 height=8
-alt=" " hspace=0 vspace=0></td>
-</font>
-</form>
-</tr>
-
-</TMPL_IF>
-</table>
-
-</td>
-</tr>
-</table>
-<p>
-For more information on the koha libary system<br> 
-visit  <b><a href="http://www.koha.org">www.koha.org</a></b></center>
-
-</html>
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/vanilla/en/opac-membership.tmpl b/koha-tmpl/opac-tmpl/vanilla/en/opac-membership.tmpl
deleted file mode 100644
index b39d59fea6..0000000000
--- a/koha-tmpl/opac-tmpl/vanilla/en/opac-membership.tmpl
+++ /dev/null
@@ -1,88 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-
-
-<!--
-
-design and HTML by rachel@katipo.co.nz, 
-templating by finlay@katipo.co.nz
-
-This is the part of the "vanilla" theme put together by Katipo Communications for general distribution with Koha. 
-
-The text about how to join the library comes from Horowhenua Library Trust, (www.library.org.nz) and is provided as a guide to the sort of information you might want to have on this page.  Please change  it to suit your own condititions.
-
-If you see strange tags and comments you don't understand they may be out of Kea our content management system. If you'd like to use Kea to change your template & website text please contact Katipo.
-
-Cheers
-R
-
-12/1/03
-
--->
-
-
-<html>
-<head>
-<title>KOHA: Membership</title>
-<link rel="stylesheet" href="<TMPL_VAR NAME='themelang'>/includes/vanilla-main.css" type="text/css" />
-<script type="text/javascript" language="javascript">
-<TMPL_INCLUDE NAME="script.js">
-</script>
-</head>
-
-
-<body marginheight="0" marginwidth="0">
-
-<!--START TOP TABLE-->
-<TMPL_INCLUDE NAME="vanilla-member-menu.inc">
-<!--START MAIN TABLE AND LEFT NAVIGATION-->
-<TMPL_INCLUDE NAME="vanilla-left-nav.inc">
-<TMPL_INCLUDE NAME="vanilla-membership-left-nav.inc">
-
-
-<!--SEARCH FORM-->
-<TMPL_INCLUDE NAME="vanilla-cat-search.inc">
-
-<!--END LEFT NAV, START CRUMBS-->
-<TMPL_INCLUDE NAME="vanilla-crumb-start.inc">	
-<a href="/">Home</a> &gt;<a href='/cgi-bin/koha/opac-membership.pl'>Membership</a>
-<!--END CRUMBS-->
-<TMPL_INCLUDE NAME="vanilla-crumb-end.inc">
-<!--CONTENT-->
-<h1>Membership</h1>
-
-<h2>Joining the Library</h2>
-<ul><li>Membership is free for anyone who lives, or pays rates, in the District.<br />
-</li><li>You can join at any of our branches and may borrow and return items at any of these libraries.<br />
-</li><li>You'll need to bring 2 forms of ID - one that has your address printed on it like a bank statement or letter, and the other with your signature or photograph.<br />
-</li><li>When you sign your new card we'll ask you to agree to some <a href="#conditions">conditions</a><br />
-</li><li>If you're under 16 we need a guarantor - an adult (usually a parent) who agrees to be responsible for the books you borrow - your adult needs to come to the library with you when you sign up.<br />
-</li><li>Remember to get yourself a Password or PIN when you register. This means you will be able to access your record online.<br />
-</li><li>We have thousands of things you can borrow and do at the Library.
-</li></ul><p>
-</p><h2>Become an Online Member </h2>
-<p>
-You can become an online member when you join the library or any time after that.  If you've already got a new plastic library card, all you need is a password. Next time you're in alibrary, come to the Help desk with your library card and we'll issue you a password.
-</p><p>
-If you forget your password at any time, just come back to the counter,<br />
-with your card or other ID and we can reset it.
-</p><p>
-Using your library card and password you can review your borrower record with us, check the books you have out, renew them, make requests (reserves), and update your personal details all from the terminals in the library or your own PC at home.
-</p><p>
-<a name="conditions"></a>
-</p><h2>Conditions of use </h2>
-<p>
-In accepting and signing your new library card, you agree to:
-</p><ul><li>Return all items borrowed by the date due.<br />
-</li><li>Pay for overdue, damaged or lost item/s and any debt collection fees.<br />
-</li><li>Advise the library of any change of address.<br />
-</li><li>Acknowledge the same responsibility for any child you have registered.
-</li></ul>
-
-<!--BOTTOM NAVIGATION - ALL-->
-<TMPL_INCLUDE NAME="vanilla-botnav-all.inc">
-<!--BOTTOM NAVIGATION - SECTION-->
-<TMPL_INCLUDE NAME="vanilla-membership-botnav.inc">
-<!--END MAIN TABLE-->
-<TMPL_INCLUDE NAME="vanilla-end-main.inc">
-</body>
-</html>
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/vanilla/en/opac-readingrecord.tmpl b/koha-tmpl/opac-tmpl/vanilla/en/opac-readingrecord.tmpl
deleted file mode 100644
index edaa9bdfa9..0000000000
--- a/koha-tmpl/opac-tmpl/vanilla/en/opac-readingrecord.tmpl
+++ /dev/null
@@ -1,90 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<!--
-
-design and HTML by rachel@katipo.co.nz, 
-templating by finlay@katipo.co.nz
-
-READING RECORD
-
-This is the part of the "vanilla" theme put together by Katipo Communications for general distribution with Koha. 
-
-If you are't planning on using the reading record feature of Koha, you can ignore this template - or remove all it's dynamic contents.
-
-Cheers
-R
-
-12/1/03
-
--->
-
-<!--html::template conversion by finlay@katipo.co.nz 25/11/02-->
-<html>
-<head>
-<title>Reading Record</title>
-<link rel="stylesheet" href="<TMPL_VAR NAME='themelang'>/includes/vanilla-main.css" type="text/css" />
-<script type="text/javascript" language="javascript">
-<TMPL_INCLUDE name="script.js">
-</script>
-</head>
-<body marginheight="0" marginwidth="0">
-
-
-
-<!--START TOP TABLE-->
-<TMPL_INCLUDE name="vanilla-member-menu.inc">
-<!--START MAIN TABLE AND LEFT NAVIGATION-->
-<TMPL_INCLUDE name="vanilla-left-nav.inc">
-<TMPL_INCLUDE name="vanilla-membership-left-nav.inc">
-
-
-<!--SEARCH FORM-->
-<TMPL_INCLUDE name="vanilla-cat-search.inc">
-<!--END LEFT NAV, START CRUMBS-->
-<TMPL_INCLUDE name="vanilla-crumb-start.inc">
-<a href="/">Home</a> &gt;<a href='/membership/'>Membership</a> &gt;<a href='/cgi-bin/koha/opac/opac-readingrecord.pl'>Reading Record</a>
-<!--END CRUMBS-->
-<TMPL_INCLUDE name="vanilla-crumb-end.inc">
-<!--CONTENT--><P>
-<span class="head1bold">Reading Record of: </span><span class="head1"><TMPL_VAR NAME="firstname"> <TMPL_VAR NAME="surname"></span><P>
-
-
-<TMPL_UNLESS NAME="count">
-You have never borrowed anything from the library.
-<TMPL_ELSE>
-<table border=0 cellspacing=0 cellpadding=0>
-<tr>
-<td colspan="4" class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td></tr>
-
-
-<tr class="table-heading"><td><a href="/cgi-bin/koha/opac-readingrecord.pl?order=title"><b>TITLE</b></a></td>
-<td></td>
-<td><a href="/cgi-bin/koha/opac-readingrecord.pl?order=author"><b>AUTHOR</b></a></td>
-<td><a href="/cgi-bin/koha/opac-readingrecord.pl"><b>DATE</b></a></td>
-</tr>
-<tr><td colspan="4" class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td></tr>
-
-<TMPL_LOOP NAME="READING_RECORD">
-
-<tr valign=top class=<TMPL_IF NAME="odd">"plain"<TMPL_ELSE>"shaded"</TMPL_IF>>
-<td class="padded"><TMPL_VAR NAME="title"></td>
-<td class="padded"><TMPL_VAR NAME="volume"></td>
-<td class="padded"><TMPL_VAR NAME="author"></td>
-<td class="padded"><TMPL_VAR NAME="date_due"></td>
-</tr>
-
-</TMPL_LOOP>
-
-<tr><td colspan="4" class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td></tr>
-</table>
-
-</TMPL_UNLESS>
-
-<!--+Katipo+end-->
-<!--BOTTOM NAVIGATION - ALL-->
-<TMPL_INCLUDE name="vanilla-botnav-all.inc">
-<!--BOTTOM NAVIGATION - SECTION-->
-<TMPL_INCLUDE name="vanilla-membership-botnav.inc">
-<!--END MAIN TABLE-->
-<TMPL_INCLUDE name="vanilla-end-main.inc">
-</body>
-</html>
diff --git a/koha-tmpl/opac-tmpl/vanilla/en/opac-reserve.tmpl b/koha-tmpl/opac-tmpl/vanilla/en/opac-reserve.tmpl
deleted file mode 100644
index 19e75408c2..0000000000
--- a/koha-tmpl/opac-tmpl/vanilla/en/opac-reserve.tmpl
+++ /dev/null
@@ -1,228 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<!--
-
-design and HTML by rachel@katipo.co.nz, 
-templating by finlay@katipo.co.nz
-
-RESERVES
-
-This is the part of the "vanilla" theme put together by Katipo Communications for general distribution with Koha. 
-
-This is definitly set up to suit Horowhenua Library Trust, if you don't have branches for example, you'll need to take that bit out.
-
-If you charge a different amount for a reserve then you may need to change the bit where it's hard coded in the text below.
-
-If you see strange tags and comments you don't understand they may be out of Kea our content management system. If you'd like to use Kea to change your template & website text please contact Katipo.
-
-Cheers
-R
-
-12/1/03
-
--->
-<html>
-<head>
-<title>Place a Reserve</title>
-<link rel="stylesheet" href="<TMPL_VAR NAME='themelang'>/includes/vanilla-main.css" type="text/css" />
-<script type="text/javascript" language="javascript">
-<TMPL_INCLUDE name="script.js">
-</script>
-</head>
-<body marginheight="0" marginwidth="0">
-<!--START TOP TABLE-->
-<TMPL_INCLUDE name="vanilla-search-menu.inc">
-
-
-<!--START MAIN TABLE AND LEFT NAVIGATION-->
-<TMPL_INCLUDE name="vanilla-left-nav.inc">
-<!--SEARCH FORM-->
-<TMPL_INCLUDE name="vanilla-cat-search.inc">
-<!--END LEFT NAV, START CRUMBS-->
-<TMPL_INCLUDE name="vanilla-crumb-start.inc">	
-<a href="/">Home</a> &gt;<a href='/cgi-bin/koha/opac-search.pl'>Searching</a>&gt;<a href='/search/cgi-bin/koha/opac-reserve.pl?bib=<TMPL_VAR NAME="biblionumber">'>Place a Reserve</a>
-<!--END CRUMBS-->
-<TMPL_INCLUDE name="vanilla-crumb-end.inc">
-<!--CONTENT-->
-<TMPL_IF NAME="message">
-<h3>
-<TMPL_IF NAME="too_much_oweing">Sorry, you cannot make reserves because you owe <TMPL_VAR NAME="too_much_oweing">.  </TMPL_IF>
-<TMPL_IF NAME="too_many_reserves">Sorry, you cannot make more than <TMPL_VAR NAME="too_many_reserves"> reserves. </TMPL_IF>
-<TMPL_IF NAME="already_reserved">You already have a reserve placed on this item.</TMPL_IF>
-<TMPL_IF NAME="no_items_selected">You must select at least one item.</TMPL_IF>
-</h3>
-</TMPL_IF>
-
-<TMPL_IF NAME="select_item_types">
-<!-- The first time round you select which bibitems you want -->
-
-<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'>">
-<P>
-<table border="0" cellspacing="0" cellpadding="5">
-  <tr>
-    <td valign="top" class="head1bold">Reserving:</td>
-    <td valign="top" class="head1"><TMPL_VAR NAME="title"> <br/>( <TMPL_VAR NAME="author"> )</td>
-  </tr>
-</table>
-<table border="0" cellspacing="0" cellpadding="5">
-  <tr>
-    <TD VALIGN="TOP" class="main">Number of Copies</td>
-    <TD VALIGN="TOP" class="main"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="20" HEIGHT="1" BORDER="0" ALT=""></td>
-    <td VALIGN="TOP" colspan="3" class="main"><TMPL_VAR NAME="itemcount"></TD>
-  </tr>
-  <tr> 
-    <TD VALIGN="TOP" class="main">Requests already received for this title</td>
-    <TD VALIGN="TOP" class="main"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="20" HEIGHT="1" BORDER="0" ALT=""></td>
-    <td VALIGN="TOP" colspan="3" class="main"> <TMPL_VAR NAME="reservecount"></TD>
-  </tr>
-  <tr> 
-    <TD VALIGN="TOP" class="main">Items curently on issue, due back</td>
-    <TD VALIGN="TOP" class="main"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="20" HEIGHT="1" BORDER="0" ALT=""></td>
-    <td VALIGN="TOP" colspan="3" class="main"><TMPL_LOOP NAME="ITEMS"><TMPL_VAR NAME="date_due">, </TMPL_LOOP></TD>
-  </tr>
-</table><P>
-<table border="0" cellspacing="0" cellpadding="5">
-  <tr> 
-    <TD VALIGN="TOP" class="head2bold">For:</td>
-    <td valign="top" class="head2"><TMPL_LOOP NAME="USER_INFO"><TMPL_VAR NAME="firstname"> <TMPL_VAR NAME="surname"> (<TMPL_VAR NAME="cardnumber">)</TMPL_LOOP></td>
-  </tr>
-</table>
-<table border="0" cellspacing="0" cellpadding="5">
-  <tr> 
-    <TD VALIGN="TOP">Pick up from:</td>
-    <TD VALIGN="TOP" class="main"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="20" HEIGHT="1" BORDER="0" ALT=""></td>
-    <TMPL_LOOP NAME="BRANCHES">
-    <td VALIGN="TOP"><INPUT TYPE="radio" name="branch" value='<TMPL_VAR NAME="branchcode">' class="checkbox"></td>
-    <td VALIGN="TOP"><TMPL_VAR NAME="branchname"></TD>
-    </TMPL_LOOP>
-  </tr>
-</table>
-
-<TMPL_IF NAME="onlyone">
-<!-- If there is only one types -->
-<input type="reset" class="reset" value="Clear">&nbsp&nbsp<input type="submit" class="submit" value="Submit">
-<input type="hidden" name="all" value="1">
-</form>
-
-<TMPL_ELSE>
-<!-- If there is more than one type -->
-
-<P>
-<table border="0" cellspacing="0" cellpadding="5">
-<tr>
-  <td valign="top" colspan="2">
-    <span class="head2">Either Tick</span>
-  </td>
-</tr>
-<tr>
-  <td valign="top">
-    <span class="heading4">
-      <input class="checkbox" type="checkbox" name="all" value="next-available">
-        Next Available Copy (any format)
-    </span>
-  </TD>
-  <td valign="top">
-     <span class="heading4">$1</span>
-  </TD>
-</tr>
-<tr>
-  <td valign="top" colspan="2">
-    <span class="head2">
-     Or Tick Acceptable Formats
-    </span>
-  </td>
-</tr>
-</table>
-
-<!--ACCEPTABLE FORMATS-->
-<table border=0 cellspacing=0 cellpadding=0>
-<tr><td colspan='<TMPL_VAR NAME="totalwidth">' class="tan"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/tan-dot.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td></tr>
-<TMPL_LOOP NAME="TYPE_ROWS">
-<tr>
-<TMPL_LOOP NAME="ROW">
-<td class="padded">
-<table border="0" cellspacing=0 cellpadding=0>
-<tr><td valign="top" ><INPUT TYPE="checkbox" name="itemtype" value='<TMPL_VAR NAME="itemtype">' class="checkbox"></td>
-<td valign="top" class="padded"><TMPL_INCLUDE NAME="itemtype-image.inc"></td></tr>
-<tr><td colspan="2"><TMPL_VAR NAME="description"></td></tr>
-<tr><td colspan="2">Reserve Fee: <TMPL_VAR NAME="reservefee"></td></tr>
-</table>
-</td>
-<TMPL_UNLESS NAME="last">
- <td class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td>
-</TMPL_UNLESS>
-<TMPL_IF NAME="fill">
- <td colspan='<TMPL_VAR NAME="fill">'><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="25" BORDER="0" hspace=0 vspace=0 ALT=""></td>
-</TMPL_IF>
-</TMPL_LOOP>
-</tr>
-</TMPL_LOOP>
-
-<tr><td valign="top" colspan='<TMPL_VAR NAME="totalwidth">' align="right"><input type="reset" class="reset" value="Clear">&nbsp&nbsp<input type="submit" class="submit" value="Submit"></TD></tr>
-
-</table></form>
-
-<TMPL_INCLUDE name="vanilla-key.inc">
-
-</TMPL_IF>
-
-
-<!-- end of the first form -->
-</TMPL_IF>
-
-<TMPL_IF NAME="item_types_selected">
-<!-- if the bibitems have already been selected -->
-
-<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'>">
-
-
-<TMPL_IF NAME="all">
-<p>Please confirm that you wish to request any item.</p>
-<input type="hidden" name="all" value="1">
-
-<TMPL_ELSE>
-
-<p>
-Please confirm that you wish to request an item of these types:
-<p>
-
-<table border=0 cellspacing=0 cellpadding=0>
-<TMPL_LOOP NAME="TYPES">
-<tr><td valign="top" class="padded"><TMPL_INCLUDE NAME="itemtype-image.inc">
-<input type="hidden" name="itemtype" value="<TMPL_VAR NAME='itemtype'>"></td>
-<td colspan="2"><TMPL_VAR NAME="description"></td></tr>
-</TMPL_LOOP>
-
-</table>
-
-</TMPL_IF>
-
-<p>Which is to be picked up from <b><TMPL_VAR NAME="branchname"></b>.<br/>
-<input type="hidden" name="branch" value="<TMPL_VAR NAME='branch'>">
-
-<TMPL_IF NAME="fee">
-<br>Note there will be a reserve charge of <b>$<TMPL_VAR NAME="fee"></b><br>
-</TMPL_IF>
-
-<font size=4 face="arial,helvetica"><INPUT type="submit" value="Place Reserve" class="submit"></font>
-
-</FORM>
-
-<TMPL_INCLUDE name="vanilla-key.inc">
-
-
-</TMPL_IF>
-
-
-
-<!--BOTTOM NAVIGATION - ALL-->
-<TMPL_INCLUDE name="vanilla-botnav-all.inc">
-<!--BOTTOM NAVIGATION - SECTION-->
-
-<!--END MAIN TABLE-->
-<TMPL_INCLUDE name="vanilla-end-main.inc">
-</body>
-</html>
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/vanilla/en/opac-search.tmpl b/koha-tmpl/opac-tmpl/vanilla/en/opac-search.tmpl
deleted file mode 100644
index 286cf6c32b..0000000000
--- a/koha-tmpl/opac-tmpl/vanilla/en/opac-search.tmpl
+++ /dev/null
@@ -1,123 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<!--
-
-design and HTML by rachel@katipo.co.nz, 
-templating by finlay@katipo.co.nz
-
-SEARCH
-
-This is the part of the "vanilla" theme put together by Katipo Communications for general distribution with Koha. 
-
-Add links to other searches etc to this page.
-
-If you don't wish people to search by these fields, or want to add others then this is the place to do it.
-
-If you see strange tags and comments you don't understand they may be out of Kea our content management system. If you'd like to use Kea to change your template & website text please contact Katipo.
-
-Cheers
-R
-
-12/1/03
-
--->
-<html>
-<head>
-<title>Search The Catalogue</title>
-<link rel="stylesheet" href="<TMPL_VAR NAME='themelang'>/includes/vanilla-main.css" type="text/css" />
-
-<script type="text/javascript" language="javascript">
-<TMPL_INCLUDE NAME="script.js">
-</script>
-</head>
-<body marginheight="0" marginwidth="0">
-
-<!--START TOP TABLE-->
-<TMPL_INCLUDE NAME="vanilla-search-menu.inc">
-
-
-<!--START MAIN TABLE AND LEFT NAVIGATION-->
-<TMPL_INCLUDE NAME="vanilla-left-nav.inc">
-
-<!--SEARCH FORM-->
-<TMPL_INCLUDE NAME="vanilla-cat-search.inc">
-<!--END LEFT NAV, START CRUMBS-->
-<TMPL_INCLUDE NAME="vanilla-crumb-start.inc">	
-<a href="/">Home</a> &gt;<a href='/cgi-bin/koha/opac-search.pl'>Search</a>
-<!--END CRUMBS-->
-<TMPL_INCLUDE NAME="vanilla-crumb-end.inc">
-<!--CONTENT-->
-
-<h1>Search the Catalogue</h1>
-
-<FORM ACTION="/cgi-bin/koha/opac-searchresults.pl" method=post>
-<TABLE cellpadding=0 cellspacing=5 border=0>
-
-<TR VALIGN=TOP>
-<TD>Title</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>Exact</td>
-</TR>
-<TR VALIGN=TOP> 
-<TD>Author</TD> <TD><INPUT TYPE="text"  SIZE="25"   NAME="author"></TD></TR>
-<TR VALIGN=TOP>
-<TD>Keywords</TD> <TD><INPUT TYPE="text"  SIZE="25"   NAME="keyword"></TD></TR>
-
-<TR VALIGN=TOP>
-<TD>Class</TD> <TD><select   SIZE="1"   NAME="class">
-	<option value="">Any
-	<!-- fetch class list -->
-	<TMPL_VAR name="classlist">
-</select>
-	
-</TD>
-</TR>
-
-<tr valign=top><td></td>
-<td><input type="submit" value="OK Start Search" SIZE="15" class="submit">
-</td></tr>
-<tr valign=top>
-<td colspan=3><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="10" HEIGHT="5" BORDER="0" ALT="">
-</td></tr>
-
-
-<TR VALIGN=TOP>
-<TD colspan=3><H3>Search by List of Subjects</H3></TD> </TR>
-
-<TR VALIGN=TOP>
-<TD>Subject</TD>
-
-<TD><INPUT TYPE="text"  SIZE="25"   NAME="subject"></TD>
-<td><input type="submit" value="OK" SIZE="2" class="submit"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="10" HEIGHT="5" BORDER="0" align="right" ALT=""></td></TR>
-<tr valign=top>
-<td colspan=3><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="10" HEIGHT="5" BORDER="0" ALT="">
-</td></tr>
-<TR VALIGN=TOP>
-<TD><H3>Search by Specific Item</H3></TD></TR>
-
-<TR VALIGN=TOP>
-<TD>Item Number</TD>
-<TD><INPUT TYPE="text"  SIZE="25"   NAME="itemnumber"></TD>
-<td><input type="submit" value="OK" SIZE="2"   class="green-box"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="10" HEIGHT="5" BORDER="0" align="right" ALT=""></td></TR>
-
-</TR>
-<TR VALIGN=TOP>
-<td></td>
-<TD><font size=4 face="arial,helvetica">
-<INPUT TYPE="reset"  value="Reset" SIZE="10" class="reset"></font></td></tr>
-
-</TABLE>
-</FORM>
-
-<TABLE cellpadding=5 cellspacing=5 border=0>
-
-</TABLE>
-
-
-
-<!--BOTTOM NAVIGATION - ALL-->
-<TMPL_INCLUDE NAME="vanilla-botnav-all.inc">
-
-<!--END MAIN TABLE-->
-<TMPL_INCLUDE NAME="vanilla-end-main.inc">
-</body>
-</html>
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/vanilla/en/opac-searchresults.tmpl b/koha-tmpl/opac-tmpl/vanilla/en/opac-searchresults.tmpl
deleted file mode 100644
index c7a4a4ddf1..0000000000
--- a/koha-tmpl/opac-tmpl/vanilla/en/opac-searchresults.tmpl
+++ /dev/null
@@ -1,140 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<!--
-
-design and HTML by rachel@katipo.co.nz, 
-templating by finlay@katipo.co.nz
-
-This is the part of the "vanilla" theme put together by Katipo Communications for general distribution with Koha. 
-
-The text about how to join the library comes from Horowhenua Library Trust, (www.library.org.nz) and is provided as a guide to the sort of information you might want to have on this page.  Please change  it to suit your own condititions.
-
-If you see strange tags and comments you don't understand they may be out of Kea our content management system. If you'd like to use Kea to change your template & website text please contact Katipo.
-
-Cheers
-R
-
-12/1/03
-
--->
-<html>
-<head>
-<title>Search Results</title>
-<link rel="stylesheet" href="<TMPL_VAR NAME='themelang'>/includes/vanilla-main.css" type="text/css" />
-
-<script type="text/javascript" language="javascript">
-<TMPL_INCLUDE NAME="script.js">
-</script>
-</head>
-<body marginheight="0" marginwidth="0">
-<!--START TOP TABLE-->
-<TMPL_INCLUDE NAME="vanilla-search-menu.inc">
-<!--START MAIN TABLE AND LEFT NAVIGATION-->
-
-<TMPL_INCLUDE NAME="vanilla-left-nav.inc">
-
-<!--SEARCH FORM-->
-<TMPL_INCLUDE NAME="vanilla-cat-search.inc">
-<!--END LEFT NAV, START CRUMBS-->
-<TMPL_INCLUDE NAME="vanilla-crumb-start.inc">	
-<a href="/">Home</a> &gt;<a href='/cgi-bin/koha/opac-search.pl'>Searching</a> &gt;<a href='/cgi-bin/koha/opac-searchresults.pl?<TMPL_LOOP NAME="FORMINPUTS">&<TMPL_VAR NAME="field">=<TMPL_VAR NAME="value" ESCAPE=URL></TMPL_LOOP>'>Search Results</a>
-<!--END CRUMBS-->
-<TMPL_INCLUDE NAME="vanilla-crumb-end.inc">
-<!--CONTENT-->
-<TMPL_IF NAME="searchdesc">
-    <h1>Results for Search: <TMPL_VAR NAME="searchdesc"></h1>
-<TMPL_ELSE>
-    <h1>You did not specify any seach criteria</h1>
-</TMPL_IF>
-
-<TMPL_IF NAME="numrecords">
-
-
-<span>
-    <TMPL_LOOP NAME="numbers">
-	<TMPL_IF NAME="highlight">
-	   <a href="/cgi-bin/koha/opac-searchresults.pl?startfrom=<TMPL_VAR NAME='startfrom'><TMPL_LOOP NAME='FORMINPUTS'>&<TMPL_VAR NAME='field'>=<TMPL_VAR NAME='value' ESCAPE=URL></TMPL_LOOP>" class="selected-number"><TMPL_VAR NAME=number></a>
-	<TMPL_ELSE>
-	    <a href="/cgi-bin/koha/opac-searchresults.pl?startfrom=<TMPL_VAR NAME='startfrom'><TMPL_LOOP NAME='FORMINPUTS'>&<TMPL_VAR NAME='field'>=<TMPL_VAR NAME='value' ESCAPE=URL></TMPL_LOOP>" class="search-number"><TMPL_VAR NAME='number'></a>
-	</TMPL_IF>
-    </TMPL_LOOP>
-</span> 
-
-
-<P>Results <TMPL_VAR NAME="startfrom"> through <TMPL_VAR NAME="endat"> of <TMPL_VAR NAME="numrecords"> records.</p>
-
-<!-- If we have a subject table -->
-    <TMPL_IF NAME="subjectsearch">
-    <table border=0 cellspacing=0 cellpadding=2>
-    <tr>
-<tr><td class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td></tr>
-	    <td class="table-heading">Subject</td>	    
-    </tr>
-<tr><td class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td></tr>
-
-       <TMPL_LOOP NAME=SEARCH_RESULTS>
-       <tr class=<TMPL_IF NAME="odd">"plain"<TMPL_ELSE>"shaded"</TMPL_IF>>
-       <td class="padded"><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><td colspan=5 class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td></tr>
-    </table>
-    
-<!-- Else we have a list of items -->    
-    <TMPL_ELSE>
-
-
- <table border=0 cellspacing=0 cellpadding=0>
-
-    <tr>
-<tr><td colspan="5" class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td></tr>
-<tr>	   
- <td class="table-heading">Title</td>
-<td class="table-heading">Author</td>
-<td class="table-heading">&copy;</td>
-<td class="table-heading">Copies</td>
-<td class="table-heading">Location/Availability</td>
-	    
-    </tr>
-<tr><td colspan="5" class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td></tr>
-
-
-<!-- Actual Search Results -->
-<TMPL_LOOP NAME="SEARCH_RESULTS">    
-      <tr class=<TMPL_IF NAME="odd">"plain"<TMPL_ELSE>"pink"</TMPL_IF>>
-      <td class="padded" ><a href=/cgi-bin/koha/opac-detail.pl?bib=<TMPL_VAR NAME="biblionumber" ESCAPE=URL> ><TMPL_VAR NAME="title"></a></td>
-      <td class="padded"><a href=/cgi-bin/koha/opac-searchresults.pl?author=<TMPL_VAR NAME="author" ESCAPE=URL> ><TMPL_VAR NAME="author"></a></td>
-      <td class="padded"><div><TMPL_VAR NAME="copyrightdate"></div> </td>
-      <td align="center" class="padded"> <div><TMPL_VAR NAME="itemcount"></div> </td>
-      <td class="padded"> <div ><TMPL_VAR NAME="location"></div> </td>
-      </tr>
-</TMPL_LOOP>
-
-    <tr><td colspan=5 class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td></tr>
-	</table>
-</TMPL_IF>
-   <P>
-
-<span>
-    <TMPL_LOOP NAME="numbers">
-	<TMPL_IF NAME="highlight">
-	   <a href="/cgi-bin/koha/opac-searchresults.pl?startfrom=<TMPL_VAR NAME='startfrom'><TMPL_LOOP NAME='FORMINPUTS'>&<TMPL_VAR NAME='field'>=<TMPL_VAR NAME='value' ESCAPE=URL></TMPL_LOOP>" class="selected-number"><TMPL_VAR NAME=number></a>
-	<TMPL_ELSE>
-	    <a href="/cgi-bin/koha/opac-searchresults.pl?startfrom=<TMPL_VAR NAME='startfrom'><TMPL_LOOP NAME='FORMINPUTS'>&<TMPL_VAR NAME='field'>=<TMPL_VAR NAME='value' ESCAPE=URL></TMPL_LOOP>" class="search-number"><TMPL_VAR NAME='number'></a>
-	</TMPL_IF>
-    </TMPL_LOOP>
-</span> 
-
-
-
-<TMPL_ELSE>
-Sorry, there were no results.
-</TMPL_IF>
-
-
-<!--BOTTOM NAVIGATION - ALL-->
-<TMPL_INCLUDE NAME="vanilla-botnav-all.inc">
-
-<!--END MAIN TABLE-->
-<TMPL_INCLUDE NAME="vanilla-end-main.inc">
-</body>
-</html>
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/vanilla/en/opac-user.tmpl b/koha-tmpl/opac-tmpl/vanilla/en/opac-user.tmpl
deleted file mode 100644
index 14a4e63552..0000000000
--- a/koha-tmpl/opac-tmpl/vanilla/en/opac-user.tmpl
+++ /dev/null
@@ -1,261 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-
-<!--
-
-design and HTML by rachel@katipo.co.nz, 
-templating by finlay@katipo.co.nz
-
-MY ACCOUNT
-
-This is the part of the "vanilla" theme put together by Katipo Communications for general distribution with Koha. 
-
-Edit this file to control how the My Account page looks, and behaves.  
-
-If you see strange tags and comments you don't understand they may be out of Kea our content management system. If you'd like to use Kea to change your template & website text please contact Katipo.
-
-Cheers
-R
-
-12/1/03
-
--->
-
-<html>
-<head>
-<title>My Account</title>
-<link rel="stylesheet" href="<TMPL_VAR NAME='themelang'>/includes/vanilla-main.css" type="text/css" />
-<script type="text/javascript" language="javascript">
-<TMPL_INCLUDE name="script.js">
-</script>
-</head>
-<body marginheight="0" marginwidth="0">
-<!--START TOP TABLE-->
-<TMPL_INCLUDE name="vanilla-member-menu.inc">
-
-<!--START MAIN TABLE AND LEFT NAVIGATION-->
-<TMPL_INCLUDE name="vanilla-left-nav.inc">
-<TMPL_INCLUDE name="vanilla-membership-left-nav.inc">
-
-<!--SEARCH FORM-->
-<TMPL_INCLUDE name="vanilla-cat-search.inc">
-
-<!--END LEFT NAV, START CRUMBS-->
-<TMPL_INCLUDE name="crumb-start.inc">	
-<a href="/">Home</a> &gt;<a href='/membership/'>Membership</a> &gt;<a href='/cgi-bin/koha/opac-user.pl'>My Home</a>
-<!--END CRUMBS-->
-<TMPL_INCLUDE name="vanilla-crumb-end.inc">
-
-<!--CONTENT-->
-<TMPL_LOOP NAME="BORROWER_INFO">
-<h1>Welcome <TMPL_VAR NAME="firstname"> <TMPL_VAR NAME="surname"></h1>
-<!--FINES BOX-->
-<TMPL_IF NAME="amountoverfive">
-
-<table border=0 cellspacing=0 cellpadding=0  class="fines-box">
-
-<tr><td valign="top" rowspan="5" WIDTH="56"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/fine.gif" WIDTH="56" HEIGHT="55" align="top" hspace=0 vspace=0 BORDER="0"></td>
-<td valign="top" rowspan="5"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="5" HEIGHT="1"  hspace=0 vspace=0 BORDER="0"></td>
-<td valign="top" colspan="2"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="15" hspace=0 vspace=0 BORDER="0"></td>
-<td valign="top"  rowspan="5"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="10" HEIGHT="1"  hspace=0 vspace=0 BORDER="0"></td></tr>
-
-<tr><td><h3>Fines and Charges</h3></td><td valign="top"  WIDTH="25"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="25" HEIGHT="20"  hspace=0 vspace=0 BORDER="0"></td></tr>
-<tr><td><span class="small"><B>You currently owe fines and charges amounting to:&nbsp;</B></span></td>
-<td bgcolor="#ffffff" class="white-box"><span class="selected-lge"><TMPL_VAR NAME="amountoutstanding"></span></td></tr>
-
-<tr><td  valign="top"><span class="small">
-<A HREF="/cgi-bin/koha/opac-account.pl">View Details >></A></span></td>
-<td valign="top"  WIDTH="30"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="25" HEIGHT="1"  hspace=0 vspace=0 BORDER="0"></td></tr>
-
-<tr><td valign="top" colspan="3"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="5" HEIGHT="20"  hspace=0 vspace=0 BORDER="0"></td></tr></table><br />
-
-</TMPL_IF>
-<TMPL_IF NAME="amountoverzero">
-
-
-<table border=0 cellspacing=0 cellpadding=0  bgcolor="#66cc66" class="fines-box">
-
-<tr><td valign="top" rowspan="5" WIDTH="56"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/fine.gif" WIDTH="56" HEIGHT="55" align="top" hspace=0 vspace=0 BORDER="0"></td>
-<td valign="top" rowspan="5"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="5" HEIGHT="1"  hspace=0 vspace=0 BORDER="0"></td>
-<td valign="top" colspan="2"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="15" hspace=0 vspace=0 BORDER="0"></td>
-<td valign="top"  rowspan="5"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="10" HEIGHT="1"  hspace=0 vspace=0 BORDER="0"></td></tr>
-
-<tr>
- <td><h3>Fines and Charges</h3></td>
- <td valign="top"  WIDTH="25"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="25" HEIGHT="20"  hspace=0 vspace=0 BORDER="0"></td></tr>
-
-
-<tr>
- <td><span class="small"><B>You currently owe fines and charges amounting to:&nbsp;</B></span></td>
-
- <td bgcolor="#ffffff" class="white-box"><span class="selected-lge"><TMPL_VAR NAME="amountoutstanding"></span></td></tr>
-
-<tr>
- <td  valign="top"><span class="small"><A HREF="/cgi-bin/koha/opac-account.pl">View Details >></A></span></td>
- <td valign="top"  WIDTH="30"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="25" HEIGHT="1"  hspace=0 vspace=0 BORDER="0"></td></tr>
-
-<tr><td valign="top" colspan="3"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="5" HEIGHT="20"  hspace=0 vspace=0 BORDER="0"></td></tr></table><br />
-
-</TMPL_IF>
-
-</TMPL_LOOP>
-
-
-<TMPL_IF NAME="overdues_count">
-
-<table border=0 cellspacing=0 cellpadding=0 width=90%>
-
-
-<!--OVERDUES TABLE ROWS-->
-<tr><td colspan="8" ><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="5" BORDER="0" ALT=""></td></tr>
-
-<tr>
-
-<td valign="top" colspan="2"><h2>Overdues</h2></td>
-<td class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td>
-
-<td valign="top" ><div class="padded"><B>Due</B></div></td>
-
-<td class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td>
-
-<td valign="top" ><div class="padded"><B>Fine to Date</B></div></td>
-
-<td class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td>
-
-<td valign="top" ><div class="padded">&nbsp;</div></td></tr>
-
-<tr><td colspan="8" class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td></tr>
-
-<TMPL_LOOP NAME="OVERDUES">
-
-<tr>
-<td valign="top" ><TMPL_INCLUDE NAME="itemtype-image.inc"></td>
-
-<td valign="top" ><A HREF='/cgi-bin/koha/opac-detail.pl?bib=<TMPL_VAR NAME="biblionumber">' class="padded"><TMPL_VAR NAME="title"></A><br />
-<div class="padded"><TMPL_VAR NAME="author"> (<TMPL_VAR NAME="itemtype">)</div></td>
-<td class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td>
-<td valign="top" ><div class="padded"><TMPL_VAR NAME="date_due"></div></td>
-<td class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td>
-<td valign="top" ><div class="padded"><TMPL_VAR NAME="charges"></div></td>
-<td class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td>
-<td valign="top" >
-<TMPL_IF NAME="status">
-<TMPL_IF NAME="reserved">
-Not renewable
-<TMPL_ELSE>
-<A HREF='/cgi-bin/koha/opac-renew.pl?from=opac_user&item=<TMPL_VAR NAME="itemnumber">&bornum=<TMPL_VAR NAME="borrowernumber">' class="padded">Renew</A>
-</TMPL_IF>
-<TMPL_ELSE>
-Not renewable
-</TMPL_IF>
-</td></tr>
-</TMPL_LOOP>
-
-<tr><td colspan="8"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="25" BORDER="0" hspace=0 vspace=0 ALT=""></td></tr> </table>
-
-</TMPL_IF>
-
-<TMPL_IF NAME="reserves_count">
-<table border=0 cellspacing=0 cellpadding=0 width=90%>
-<tr><td colspan="8" ><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="5" BORDER="0" ALT=""></td></tr>
-
-
-<!--RESERVES TABLE ROWS-->
-<tr><td valign="top" colspan="2" ><h2>Reserves</h2></td>
-<td class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td>
-<td valign="top" ><div class="padded">
-<B>Reserve <br />Placed</B></div></td>
-
-<td class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td>
-
-<td valign="top" ><div class="padded"><B>Pick Up</B></div></td>
-
-<td class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td>
-
-<td valign="top" ><div class="padded"><B>Status</div></td></tr>
-
-<tr><td colspan="8" class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td></tr>
-
-
-<TMPL_LOOP NAME="RESERVES">
-
-
-<tr><td valign="top"><TMPL_INCLUDE NAME="itemtype-image.inc"></td>
-
-<td valign="top" ><A HREF='/cgi-bin/koha/opac-detail.pl?bib=<TMPL_VAR NAME="biblionumber">' class="padded"><TMPL_VAR NAME="btitle"></A><br />
-<div class="padded"><TMPL_VAR NAME="author"> (<TMPL_VAR NAME="itemtype">)</div></td>
-<td class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td>
-<td valign="top" ><div class="padded"><TMPL_VAR NAME="reservedate"></div></td>
-<td class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td>
-<td valign="top" ><div class="padded"><TMPL_VAR NAME="branch"></div></td>
-<td class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td>
-<td valign="top" ><div class="selected"><TMPL_IF NAME="waiting">Waiting for you<TMPL_ELSE>Not Ready</TMPL_IF></div></td></tr>
-
-</TMPL_LOOP>
-
-
-<tr><td colspan="8" ><div class="padded">If you no longer want a reserve, please <a href="mailto:librarian@library.org.nz">send us an e-mail</a>, or go to the counter at the library to get it removed.</div></td></tr>
-
-<tr><td colspan="8" ><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="25" BORDER="0" ALT=""></td></tr>
-</table>
-
-</TMPL_IF>
-
-<TMPL_IF NAME="issues_count">
-<table border=0 cellspacing=0 cellpadding=0 width=90%>
-<tr><td colspan="8" ><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="5" BORDER="0" ALT=""></td></tr>
-
-<!--ISSUES TABLE ROWS--><tr>
-<td valign="top" colspan="2" class="padded"><h2>Issues</h2></td>
-<td class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td>
-
-<td valign="top"  colspan="3"><div class="padded"><B>Due</B></div></td>
-
-<td class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td>
-
-<td valign="top" ><div class="padded">&nbsp; </div></td></tr>
-
-
-<tr><td colspan="8" class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td></tr>
-
-<tr><td colspan="8" class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td></tr>
-
-
-<TMPL_LOOP NAME="ISSUES">
-
-<tr><td valign="top" ><TMPL_INCLUDE NAME="itemtype-image.inc"></td>
-
-<td valign="top" ><A HREF='/cgi-bin/koha/opac-detail.pl?bib=<TMPL_VAR NAME="biblionumber">' class="padded"><TMPL_VAR NAME="title"></A><br />
-<div class="padded"><TMPL_VAR NAME="author"> (<TMPL_VAR NAME="itemtype">)</div></td>
-<td class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td>
-<td valign="top"  colspan="3"><div class="padded"><TMPL_VAR NAME="date_due"></div></td>
-<td class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td>
-<td valign="top" >
-<TMPL_IF NAME="status">
-<A HREF='/cgi-bin/koha/opac-renew.pl?from=opac_user&item=<TMPL_VAR NAME="itemnumber">&bornum=<TMPL_VAR NAME="borrowernumber">' class="padded">Renew</A>
-<TMPL_ELSE>
-Not renewable
-</TMPL_IF>
-</td></tr>
-</TMPL_LOOP>
-
-<tr><td colspan="8" ><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="5" BORDER="0" ALT=""></td></tr>
-
-</table>
-
-</TMPL_IF>
-
-<TMPL_INCLUDE name="vanilla-key.inc">
-<br />
-<FORM ACTION="/cgi-bin/koha/opac-readingrecord.pl" method=post>
-<input type="submit" value="Reading Record" class="submit">
-</form>
-<!--BOTTOM NAVIGATION - ALL-->
-<TMPL_INCLUDE name="vanilla-botnav-all.inc">
-<!--BOTTOM NAVIGATION - SECTION-->
-<TMPL_INCLUDE name="vanilla-membership-botnav.inc">
-<!--END MAIN TABLE-->
-<TMPL_INCLUDE name="vanilla-end-main.inc">
-</body>
-</html>
-
-
diff --git a/koha-tmpl/opac-tmpl/vanilla/en/opac-userdetails.tmpl b/koha-tmpl/opac-tmpl/vanilla/en/opac-userdetails.tmpl
deleted file mode 100644
index 4927a091b2..0000000000
--- a/koha-tmpl/opac-tmpl/vanilla/en/opac-userdetails.tmpl
+++ /dev/null
@@ -1,170 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-
-<!--
-
-design and HTML by rachel@katipo.co.nz, 
-templating by finlay@katipo.co.nz
-
-PERSONAL DETAILS PAGE
-
-This is the part of the "vanilla" theme put together by Katipo Communications for general distribution with Koha. 
-
-Change this template to control how a users personal details page works.
-
-If you see strange tags and comments you don't understand they may be out of Kea our content management system. If you'd like to use Kea to change your template & website text please contact Katipo.
-
-Cheers
-R
-
-12/1/03
-
--->
-<html>
-<head>
-<title>Personal Details</title>
-<link rel="stylesheet" href="<TMPL_VAR NAME='themelang'>/includes/vanilla-main.css" type="text/css" />
-<script type="text/javascript" language="javascript">
-<TMPL_INCLUDE name="script.js">
-</script>
-</head>
-
-<body marginheight="0" marginwidth="0">
-
-
-<!--START TOP TABLE-->
-<TMPL_INCLUDE NAME="vanilla-member-menu.inc">
-
-
-<!--START MAIN TABLE AND LEFT NAVIGATION-->
-<TMPL_INCLUDE NAME="vanilla-left-nav.inc">
-<TMPL_INCLUDE NAME="vanilla-membership-left-nav.inc">
-
-
-<!--SEARCH FORM-->
-<TMPL_INCLUDE NAME="vanilla-cat-search.inc">
-
-<!--END LEFT NAV, START CRUMBS-->
-<TMPL_INCLUDE NAME="vanilla-crumb-start.inc">	
-<a href="/">Home</a> &gt;<a href='/membership/'>Membership</a> &gt;<a href='/cgi-bin/koha/opac-userdetails.pl'>Personal Details</a>
-<!--END CRUMBS-->
-<TMPL_INCLUDE NAME="vanilla-crumb-end.inc">
-
-
-<!--CONTENT-->
-<h1><b>Personal Details:</b> <TMPL_VAR NAME="firstname"> <TMPL_VAR NAME="surname"></h1>
-
-
-<TABLE  CELLSPACING=0  CELLPADDING=0 border=0>
-
-<tr VALIGN=TOP>	
-<TD class="label">
-Name:</td><td class="data"> <TMPL_VAR NAME="firstname"> <TMPL_VAR NAME="surname">  (<TMPL_VAR NAME="surname">, <TMPL_VAR NAME="title"> <TMPL_VAR NAME="intials">)</td></tr>
-<tr VALIGN=TOP>	
-<TD class="label">
-Card Number:</td><td class="data"><TMPL_VAR NAME="cardnumber"></td></tr>
-
-<tr VALIGN=TOP>	
-<tr><td >&nbsp; </td></tr>
-<TD colspan="2"><h3>Contact Details</h3></td></tr>
-<tr><td colspan="2" class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td></tr>
-
-<tr VALIGN=TOP>	
-<TD class="label">Postal Address:</td>
-<td class="data"> <TMPL_VAR NAME="streetaddress">, <TMPL_VAR NAME="city"></td></tr>
-
-<tr VALIGN=TOP>	
-<TD class="label">Home Address:</td>
-<td class="data"> <TMPL_VAR NAME="altstreetaddress">, <TMPL_VAR NAME="altcity">   </td></tr>
-
-<tr VALIGN=TOP>	
-<TD class="label">Phone (Home):</td>
-<td class="data">  <TMPL_VAR NAME="phone"></td></tr>
-
-<tr VALIGN=TOP>	
-<TD class="label">Phone (Daytime):</td>
-<td class="data"> <TMPL_VAR NAME="phoneday">  </td></tr>
-
-<tr VALIGN=TOP>	
-<TD class="label">Fax:</td>
-<td class="data"> <TMPL_VAR NAME="faxnumber"></td></tr>
-
-<tr VALIGN=TOP>	
-<TD class="label">E-mail:</td>
-<td class="data">  <a href="mailto:<TMPL_VAR NAME='emailaddress'>"><TMPL_VAR NAME="emailaddress"></a></td></tr>
-
-<tr VALIGN=TOP>	
-<TD class="label">Textmessaging:</td>
-<td class="data">  </td></tr>
-
-<tr><td >&nbsp; </td></tr>
-
-<tr VALIGN=TOP>	
-<TD colspan="2"><h3>Membership Details</h3></td></tr>
-<tr><td colspan="2" class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td></tr>
-<tr VALIGN=TOP>	
-<TD class="label">Membership Number:</td><td class="data"> <TMPL_VAR NAME="borrowernumber"></td></tr>
-<tr VALIGN=TOP>	
-<TD class="label">Membership:</td><td class="data">  <TMPL_VAR NAME="categorycode"></td></tr>
-<tr VALIGN=TOP>	
-<TD class="label">Area:</td><td class="data">  <TMPL_VAR NAME="area"></td></tr>
-<tr VALIGN=TOP>	
-<TD class="label">Fee:</td><td class="data">  /year, Paid</td></tr>
-<tr VALIGN=TOP>	
-<TD class="label">Joined:</td><td class="data">  <TMPL_VAR NAME="dateenrolled">  </td></tr>
-<tr VALIGN=TOP>	
-<TD class="label">Expires:</td><td class="data"> <TMPL_VAR NAME="expiry"> </td></tr>
-<tr VALIGN=TOP>	
-<TD class="label">Joining Branch:</td><td class="data">   </td></tr>
-<tr><td >&nbsp; </td></tr>
-
-<tr VALIGN=TOP>	
-<TD colspan="2"><h3>Identity Details</h3></td></tr>
-<tr><td colspan="2" class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td></tr>
-<tr VALIGN=TOP>	
-<TD class="label">DoB:</td><td class="data"> <TMPL_VAR NAME="dateofbirth"></td></tr>
-<tr VALIGN=TOP>	
-<TD class="label">Sex:</td><td class="data">  <TMPL_VAR NAME="sex"></td></tr>
-<tr><td >&nbsp; </td></tr>
-
-<tr VALIGN=TOP>	
-<TD colspan="2"><h3>Alternative Contact Details</h3></td></tr>
-<tr><td colspan="2" class="line"><IMG SRC="<TMPL_VAR NAME='themelang'>/images/holder.gif" WIDTH="1" HEIGHT="1" BORDER="0" ALT=""></td></tr>
-<tr VALIGN=TOP>	
-<TD class="label">Alternative Contact:</td><td class="data"> <TMPL_VAR NAME="contactname"></td></tr>
-<tr VALIGN=TOP>	
-<TD class="label">Phone:</td><td class="data"> <TMPL_VAR NAME="altphone"></td></tr>
-<tr VALIGN=TOP>	
-<TD class="label">Relationship:</td><td class="data"> <TMPL_VAR NAME="altrelationship">  </td></tr>
-<tr VALIGN=TOP>	
-<TD class="label">Notes:</td><td class="data"> <TMPL_VAR NAME="altnotes"> </td></tr>
-<tr VALIGN=TOP>	
-<TD class="label">Guarantor:</td><td class="data"> <TMPL_VAR NAME="guarantor"> </td></tr>
-
-<P>
-
-
-<tr VALIGN=TOP>	
-<TD></td><td>
-<form action="/cgi-bin/koha/opac-userupdate.pl" method="get">
-<input type="submit" name="Modify" value="Modify" class="submit">
-</form>
-</p>
-
-</TD>
-</TR>
-</TABLE>
-</FORM>
-
-
-
-
-
-<!--+Katipo+end-->
-<!--BOTTOM NAVIGATION - ALL-->
-<TMPL_INCLUDE NAME="vanilla-botnav-all.inc">
-<!--BOTTOM NAVIGATION - SECTION-->
-<TMPL_INCLUDE NAME="vanilla-membership-botnav.inc">
-<!--END MAIN TABLE-->
-<TMPL_INCLUDE NAME="vanilla-end-main.inc">
-</body>
-</html>
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/vanilla/en/opac-userupdate.tmpl b/koha-tmpl/opac-tmpl/vanilla/en/opac-userupdate.tmpl
deleted file mode 100644
index 4ae2704e90..0000000000
--- a/koha-tmpl/opac-tmpl/vanilla/en/opac-userupdate.tmpl
+++ /dev/null
@@ -1,95 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<!--
-
-design and HTML by rachel@katipo.co.nz, 
-templating by finlay@katipo.co.nz
-
-This is the part of the "vanilla" theme put together by Katipo Communications for general distribution with Koha. 
-
-The text about how to join the library comes from Horowhenua Library Trust, (www.library.org.nz) and is provided as a guide to the sort of information you might want to have on this page.  Please change  it to suit your own condititions.
-
-If you see strange tags and comments you don't understand they may be out of Kea our content management system. If you'd like to use Kea to change your template & website text please contact Katipo.
-
-Cheers
-R
-
-12/1/03
-
--->
-<html>
-<head>
-<title>Update My Account</title>
-<link rel="stylesheet" href="<TMPL_VAR NAME='themelang'>/includes/vanilla-main.css" type="text/css" />
-<script type="text/javascript" language="javascript">
-<TMPL_INCLUDE name="script.js">
-</script>
-</head>
-<body marginheight="0" marginwidth="0">
-
-
-<!--START TOP TABLE-->
-<TMPL_INCLUDE name="vanilla-member-menu.inc">
-<!--START MAIN TABLE AND LEFT NAVIGATION-->
-<TMPL_INCLUDE name="vanilla-left-nav.inc">
-<TMPL_INCLUDE name="vanilla-membership-left-nav.inc">
-
-<!--SEARCH FORM-->
-<TMPL_INCLUDE name="vanilla-cat-search.inc">
-
-<!--END LEFT NAV, START CRUMBS-->
-<TMPL_INCLUDE name="vanilla-crumb-start.inc">	
-<a href="/">Home</a> &gt;<a href='/membership/'>Membership</a> &gt;<a href='/cgi-bin/koha/opac-user.pl'>My Account</a>
-<!--END CRUMBS-->
-<TMPL_INCLUDE name="vanilla-crumb-end.inc">
-<!--CONTENT-->
-
-
-<TMPL_LOOP NAME="BORROWER_INFO">
-
-<FORM ACTION="/cgi-bin/koha/opac-userupdate.pl" method=get>
-<TABLE >
-
-<TR VALIGN=TOP>
-<TD class="label">Surname</TD> <TD><INPUT TYPE="text"  SIZE="25" value="<TMPL_VAR NAME='surname'>"  NAME="surname"></TD></TR>
-
-<TR VALIGN=TOP> 
-<TD class="label">Title</TD> <TD><INPUT TYPE="text"  SIZE="25" value="<TMPL_VAR NAME='title'>"  NAME="title"></TD></TR>
-
-<TR VALIGN=TOP> 
-<TD class="label">Firstname</TD> <TD><INPUT TYPE="text"  SIZE="25" value="<TMPL_VAR NAME='firstname'>"  NAME="firstname"></TD></TR>
-
-<TR VALIGN=TOP> 
-<TD class="label">Street address</TD> <TD><INPUT TYPE="text"  SIZE="25" value="<TMPL_VAR NAME='streetaddress'>"  NAME="streetaddress"></TD></TR>
-
-<TR VALIGN=TOP> 
-<TD class="label">City</TD> <TD><INPUT TYPE="text"  SIZE="25" value="<TMPL_VAR NAME='city'>"  NAME="city"></TD></TR>
-
-
-<TR VALIGN=TOP> 
-<TD class="label">Home phone</TD> <TD><INPUT TYPE="text"  SIZE="25" value="<TMPL_VAR NAME='phone'>"  NAME="phone"></TD></TR>
-
-<TR VALIGN=TOP> 
-<TD class="label">Work/Fax phone</TD> <TD><INPUT TYPE="text"  SIZE="25" value="<TMPL_VAR NAME='faxnumber'>"  NAME="faxnumber"></TD></TR>
-
-<TR VALIGN=TOP> 
-<TD class="label">Email</TD> <TD><INPUT TYPE="text"  SIZE="25" value="<TMPL_VAR NAME='emailaddress'>"  NAME="emailaddress"></TD></TR>
-
-
-
-<TR VALIGN=TOP> <td></td>
-<td><INPUT type="submit" value="Submit"></td>
-</tr>
-
-</TABLE>
-</FORM>
-</CENTER>
-
-</TMPL_LOOP>
-<!--BOTTOM NAVIGATION - ALL-->
-<TMPL_INCLUDE name="vanilla-botnav-all.inc">
-<!--BOTTOM NAVIGATION - SECTION-->
-<TMPL_INCLUDE name="vanilla-membership-botnav.inc">
-<!--END MAIN TABLE-->
-<TMPL_INCLUDE name="vanilla-end-main.inc">
-</body>
-</html>
diff --git a/members/member.pl b/members/member.pl
index 82bbfc1fde..1c4565c667 100755
--- a/members/member.pl
+++ b/members/member.pl
@@ -63,19 +63,21 @@ my $theme = $input->param('theme') || "default";
 
 
 my $member=$input->param('member');
+my $orderby=$input->param('orderby');
+$orderby = "surname,firstname" unless $orderby;
 $member =~ s/,//g;   #remove any commas from search string
-
+$member =~ s/\*/%/g;
 my $env;
 
 my ($count,$results);
 
 if(length($member) == 1)
 {
-	($count,$results)=BornameSearch($env,$member,"simple");
+	($count,$results)=BornameSearch($env,$member,$orderby,"simple");
 }
 else
 {
-	($count,$results)=BornameSearch($env,$member,"advanced");
+	($count,$results)=BornameSearch($env,$member,$orderby,"advanced");
 }
 
 
diff --git a/members/memberentry.pl b/members/memberentry.pl
index 0f2223f43f..02fa920e10 100755
--- a/members/memberentry.pl
+++ b/members/memberentry.pl
@@ -77,7 +77,7 @@ if ($op eq 'add' or $op eq 'modify') {
 	} else {
 		#check cardnumber is valid
 		my $nounique;
-		if ( $data{'actionType'} eq "Add" )    {
+		if ( $op eq "add" )    {
 			$nounique = 0;
 		} else {
 			$nounique = 1;
diff --git a/misc/Install.pm b/misc/Install.pm
index 97c82c5855..1bd65c3bb6 100644
--- a/misc/Install.pm
+++ b/misc/Install.pm
@@ -2,7 +2,7 @@ package Install; #assumes Install.pm
 
 
 # Copyright 2000-2002 Katipo Communications
-# Contains parts Copyright 2003 MJ Ray
+# Contains parts Copyright 2003-4 MJ Ray
 #
 # This file is part of Koha.
 #
@@ -26,9 +26,10 @@ use strict;
 use POSIX;
 #MJR: everyone will have these modules, right?
 # They look like part of perl core to me
-use Term::Cap;
+#use Term::Cap;
 use Term::ANSIColor qw(:constants);
 use Text::Wrap;
+use File::Temp qw/ :mktemp /;
 require Exporter;
 
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
@@ -60,6 +61,7 @@ $VERSION = 0.01;
 		&checkabortedinstall
 		&getmessage
 		&showmessage
+		&completeupgrade
 		&releasecandidatewarning
 		&getinstallationdirectories
 		&getdatabaseinfo
@@ -85,7 +87,7 @@ use vars qw( $domainname );			# set in installer.pl
 
 use vars qw( $etcdir );				# set in installer.pl, usu. /etc
 use vars qw( $intranetdir $opacdir $kohalogdir );
-use vars qw( $realhttpdconf $httpduser );
+use vars qw( $realhttpdconf $httpduser $httpdgroup );
 use vars qw( $servername $svr_admin $opacport $intranetport );
 use vars qw( $mysqldir );
 use vars qw( $database $mysqluser );
@@ -106,10 +108,10 @@ a line of equal signs as illegal POD directives.
 
 =cut
 
-my $termios = POSIX::Termios->new();
-$termios->getattr();
-my $terminal = Term::Cap->Tgetent({OSPEED=>$termios->getospeed()});
-my $clear_string = "\n";
+#my $termios = POSIX::Termios->new();
+#$termios->getattr();
+#my $terminal = Term::Cap->Tgetent({OSPEED=>$termios->getospeed()});
+my $clear_string = "\n\n"; #MJR: was $terminal->Tputs('cl');
 
 sub heading ($) {
   my $title = shift;
@@ -118,7 +120,7 @@ sub heading ($) {
 }
 
 my $mycnf = $ENV{HOME}."/.my.cnf";
-my $mytmpcnf = `mktemp my.cnf.koha.XXXXXX`;
+my $mytmpcnf = mktemp("my.cnf.koha.XXXXXX");
 chomp($mytmpcnf);
 
 my $messages;
@@ -126,14 +128,13 @@ $messages->{'continuing'}->{en}="Great!  Continuing...\n\n";
 $messages->{'WelcomeToKohaInstaller'}->{en} =
    heading('Welcome to the Koha Installer') . qq|
 This program will ask some questions and try to install koha for you.
-You need to know: 
-* where most koha files should be stored (you can set the prefix environment variable for this);
-* the username and password of a mysql superuser; 
-* Details of your library setup. 
-* Details of your Apache setup.
+You need to know: where most koha files should be stored (you can set
+the prefix environment variable for this); the username and password of
+a mysql superuser; and details of your library setup.  You may also need
+to know details of your Apache setup.
 
 If you want to install the Koha configuration files somewhere other than
-/etc (for multiple Koha versions on one system, for example), you should
+/etc (for installing not as root, or to have many Kohas on one system, for example), you should
 set the etcdir environment variable.  Please look at your manuals for
 details of how to set that.
 
@@ -148,7 +149,7 @@ Are you ready to begin the installation? ([Y]/N): |;
 
 $messages->{'WelcomeToUpgrader'}->{en} =
    heading('Welcome to the Koha Upgrader') . qq|
-You are attempting to upgrade to Koha %s.
+You are attempting to upgrade from Koha %s to Koha %s.
 
 We recommend that you do a complete backup of all your files before upgrading.
 This upgrade script will make a backup copy of your files for you.
@@ -261,10 +262,14 @@ Press the <ENTER> key to continue: |;
 
 $messages->{'Completed'}->{en} = heading('INSTALLATION COMPLETE') . qq|
 Congratulations ... your Koha installation is complete!
+
 You will be able to connect to your Librarian interface at:
+
    http://%s\:%s/
+
    use the koha admin mysql login and password to connect to this interface.
 and the OPAC interface at:
+
    http://%s\:%s/
    
 NOTE: You need to add lines to your main httpd.conf to include
@@ -282,6 +287,20 @@ Please report any problems you encounter through http://bugs.koha.org/
 Press <ENTER> to exit the installer: |;
 
 #'
+
+=item completeupgrade
+
+   completeupgrade
+
+Display a message describing what may need changing in httpd.conf
+and any other instructions
+
+=cut
+
+sub completeupgrade {
+	showmessage(getmessage('UpgradeCompleted',[$intranetdir,$intranetdir,$intranetdir,$opacdir,$opacdir,$intranetdir]),'PressEnter');
+}
+
 sub releasecandidatewarning {
     my $message=getmessage('ReleaseCandidateWarning', [$newversion, $newversion]);
     my $answer=showmessage($message, 'yn', 'n');
@@ -289,7 +308,7 @@ sub releasecandidatewarning {
     if ($answer =~ /y/i) {
 	print getmessage('continuing');
     } else {
-	my $message=getmessage('WatchForReleaseAnnouncements','');
+	my $message=getmessage('WatchForReleaseAnnouncements');
 	print $message."\n";
 	exit;
     };
@@ -374,11 +393,13 @@ sub setdomainname ($) {
 
 Sets the sysconfdir, normally /etc.
 This should be an absolute path; a trailing / is not required.
+Must be writeable, else we die.
 
 =cut
 
 sub setetcdir ($) {
     ($etcdir) = @_;
+    if (! ((-d $etcdir) && (-w $etcdir))) { die("Cannot write to $etcdir! Please set the etcdir environment variable to a writeable directory.\nFailed"); }
 }
 
 =item getkohaversion
@@ -932,7 +953,7 @@ function does not return any values.
 
 sub getinstallationdirectories {
 	my ($auto_install) = @_;
-	if (!$ENV{prefix}) { $ENV{prefix} = "/usr/local"; } #"
+	if (!$ENV{prefix}) { $ENV{prefix} = "/usr/local"; }
     $opacdir = $ENV{prefix}.'/koha/opac';
     $intranetdir = $ENV{prefix}.'/koha/intranet';
     my $getdirinfo=1;
@@ -1025,7 +1046,7 @@ sub getmysqldir {
 			  /usr/local
 			  /usr
 			  )) {
-       if ( -d $mysql  && -f "$mysql/bin/mysqladmin") { #"
+       if ( -d $mysql  && -f "$mysql/bin/mysqladmin") {
 	    $mysqldir=$mysql;
        }
     }
@@ -1302,7 +1323,9 @@ and the installer will leave comments in
 
 NOTE: You will need to add lines to your main httpd.conf to
 include %s/koha-httpd.conf
+(using the Include directive)
 and to make sure it is listening on the right ports
+and host names
 (using the Listen directive).
 
 Press <ENTER> to continue: |;
@@ -1462,12 +1485,22 @@ sub updateapacheconf {
 	}
 	print SITE <<EOP
 
+# Koha 2.2 Apache Virtual Host Config File
+#
+# Please include this file in your apache configuration.
+# The best way to do that depends on your site setup.
+# Some like an Include adding to /etc/apache/httpd.conf
+# and some prefer a symlink to this file from some dir.
+# Please refer to your system manuals.
+
 # Ports to listen to for Koha
 # uncomment these if they aren't already in main httpd.conf
 #$opaclisten
 #$intranetlisten
 
 # NameVirtualHost is used by one of the optional configurations detailed below
+# Please make sure this line is correct before uncommenting.
+# See http://httpd.apache.org/docs/vhosts/ for some guides.
 
 #NameVirtualHost 11.22.33.44
 
@@ -1477,6 +1510,7 @@ sub updateapacheconf {
    DocumentRoot $opacdir/htdocs
    ServerName $servername
    ScriptAlias /cgi-bin/koha/ $opacdir/cgi-bin/
+   Redirect permanent index.html http://$servername\:$opacport/cgi-bin/koha/opac-main.pl
    ErrorLog $logfiledir/opac-error_log
    TransferLog $logfiledir/opac-access_log
    SetEnv PERL5LIB "$intranetdir/modules"
@@ -1490,6 +1524,7 @@ sub updateapacheconf {
    DocumentRoot $intranetdir/htdocs
    ServerName $servername
    ScriptAlias /cgi-bin/koha/ "$intranetdir/cgi-bin/"
+   Redirect permanent index.html http://$servername\:$intranetport/cgi-bin/koha/mainpage.pl
    ErrorLog $logfiledir/koha-error_log
    TransferLog $logfiledir/koha-access_log
    SetEnv PERL5LIB "$intranetdir/modules"
@@ -1770,8 +1805,8 @@ sub databasesetup {
 	setmysqlclipass($mysqlpass);
 	# Set up permissions
 	startsysout();
-	print system("$mysqldir/bin/mysql -u$mysqluser mysql -e \"insert into user (Host,User,Password) values ('$hostname','$user',password('$pass'))\"\;");#"
-	system("$mysqldir/bin/mysql -u$mysqluser mysql -e \"insert into db (Host,Db,User,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv, index_priv, alter_priv) values ('%','$database','$user','Y','Y','Y','Y','Y','Y','Y','Y')\"");
+	print system("$mysqldir/bin/mysql -u$mysqluser -e \"insert into user (Host,User,Password) values ('$hostname','$user',password('$pass'))\" mysql\;");
+	system("$mysqldir/bin/mysql -u$mysqluser -e \"insert into db (Host,Db,User,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv, index_priv, alter_priv) values ('%','$database','$user','Y','Y','Y','Y','Y','Y','Y','Y')\" mysql");
 	system("$mysqldir/bin/mysqladmin -u$mysqluser reload");
 	# Change to admin user login
 	setmysqlclipass($pass);
@@ -1844,6 +1879,7 @@ sub updatedatabase {
     $ENV{"KOHA_CONF"}=$etcdir.'/koha.conf';
     if (! -e $ENV{"KOHA_CONF"}) { $ENV{"KOHA_CONF"}=$etcdir.'/koha.conf.tmp'; }
 	startsysout();	
+	setmysqlclipass($pass);
 	my $result=system ("perl -I $intranetdir/modules scripts/updater/updatedatabase -s");
 	if ($result) {
 		restoremycnf();
@@ -1915,9 +1951,9 @@ sub populatedatabase {
 		$branchcode or $branchcode='DEF';
 
 		startsysout();
-		system("$mysqldir/bin/mysql -u$user $database -e \"insert into branches (branchcode,branchname,issuing) values ('$branchcode', '$branch', 1)\"");
-		system("$mysqldir/bin/mysql -u$user $database -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'IS')\"");
-		system("$mysqldir/bin/mysql -u$user $database -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'CU')\"");
+		system("$mysqldir/bin/mysql -u$user -e \"insert into branches (branchcode,branchname,issuing) values ('$branchcode', '$branch', 1)\" $database");
+		system("$mysqldir/bin/mysql -u$user -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'IS')\" $database");
+		system("$mysqldir/bin/mysql -u$user -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'CU')\" $database");
 
 		my $printername='lp';
 		my $printerqueue='/dev/lp0';
@@ -1936,7 +1972,7 @@ sub populatedatabase {
 			$printerqueue=~s/[^A-Za-z0-9]//g;
 		}
 		startsysout();	
-		system("$mysqldir/bin/mysql -u$user $database -e \"insert into printers (printername,printqueue,printtype) values ('$printername', '$printerqueue', '')\"");
+		system("$mysqldir/bin/mysql -u$user -e \"insert into printers (printername,printqueue,printtype) values ('$printername', '$printerqueue', '')\" $database");
 	}
 	my $language;
 	if ($auto_install->{Language}) {
@@ -1946,7 +1982,7 @@ sub populatedatabase {
 		$language=showmessage(getmessage('Language'), 'free', 'en');
 	}
 	startsysout();	
-	system("$mysqldir/bin/mysql -u$user $database -e \"update systempreferences set value='$language' where variable='opaclanguages'\"");
+	system("$mysqldir/bin/mysql -u$user -e \"update systempreferences set value='$language' where variable='opaclanguages'\" $database");
 	my @dirs;
 	if (-d "scripts/misc/sql-datas") {
 		# ask for directory to look for files to append
@@ -2116,7 +2152,8 @@ $month++;
 $year+=1900;
 my $date= sprintf "%4d-%02d-%02d_%02d:%02d:%02d", $year, $month, $day,$hr,$min,$sec;
 
-open (MD, "$mysqldir/bin/mysqldump --user=$user --password=$pass --host=$hostname $database|");
+setmysqlclipass($pass); 
+open (MD, "$mysqldir/bin/mysqldump --user=$user --host=$hostname $database|");
 
 (open BF, ">$backupdir/Koha.backup_$date") || (die "Error opening up backup file $backupdir/Koha.backup_$date: $!\n");
 
diff --git a/misc/buildrelease b/misc/buildrelease
index 340a81d2f2..f406a209be 100644
--- a/misc/buildrelease
+++ b/misc/buildrelease
@@ -1,5 +1,61 @@
 #!/usr/bin/perl
+# This script uses standard 8-space tabs with 4-space indents
+# vi users can :set sw=4 ai sm
 
+use Getopt::Long;
+use vars qw( $verbose_p );
+
+GetOptions(
+    'verbose|v' => \$verbose_p,
+) || exit(1);
+
+print <<EOM;
+***************************************
+* Welcome to the Koha Release Builder *
+***************************************
+EOM
+
+#----------------------------------------------------------
+# To guess the version, we need to first guess where this
+# script itself is Otherwise we will have different results
+# depending on whether the script is called as ./buildrelease
+# or misc/buildrelease. If we run the script from misc, we
+# will also get errors from "cvs update" later, so this is
+# rather important information
+#----------------------------------------------------------
+print STDERR "Perl reports that buildrelease is $0\n" if $verbose_p;
+my $self_path;
+if ($0 =~ /^(\.\/)*buildrelease$/) {
+    $self_path = 'buildrelease';
+} elsif ($0 =~ /^(?:(\.\/)*\/)?misc\/buildrelease$/) {
+    $self_path = 'misc/buildrelease';
+} else {
+    print <<EOM;
+
+WARNING: Unable to determine where the buildrelease script is located.
+         The version number guessed by the next step might be wrong.
+EOM
+    $self_path = (-f 'buildrelease')? 'buildrelease': 'misc/buildrelease';
+}
+print STDERR "Assuming buildrelease is $self_path\n" if $verbose_p;
+
+#----------------------------------------------------------
+# Fixup the current directory
+#----------------------------------------------------------
+if ($self_path eq 'buildrelease') {
+    print <<EOM;
+
+WARNING: You should run the buildrelease script from the top of the koha
+         CVS module.  I will try to change to the correct directory, but
+         it is better if you had ran this script there in the first place.
+EOM
+    chdir ".." || die "..: chdir: $!\n";
+    $self_path = 'misc/buildrelease';
+}
+
+#----------------------------------------------------------
+# Start the release builder
+#----------------------------------------------------------
 #sub guess_kohahtmldir ($;$);
 #----------------------------------------------------------
 # DIRECTORIES where source code is located
@@ -13,6 +69,7 @@ $roothomedir='/root' unless defined $roothomedir;
 my $has_kohaautobuild_conf = 0;
 
 if (-e "$roothomedir/.kohaautobuild.conf") {
+    print STDERR "$roothomedir/.kohaautobuild.conf found\n" if $verbose_p;
     open C, "<$roothomedir/.kohaautobuild.conf";
     while (<C>) {
 	chomp;
@@ -29,18 +86,13 @@ if (-e "$roothomedir/.kohaautobuild.conf") {
 my $input;
 
 print qq |
-***************************************
-* Welcome to the Koha Release Builder *
-***************************************
-
 This script will automatically build a release tarball.
 
 The script assumes that you already have the koha and koha-html modules checked
 out for the release that you want to build, although it will update the modules
 before building.
-
 |;
-print "\nWhere is the 'koha' cvs module located [$kohadir]: ";
+print "\nWhere is the 'koha' cvs module located? [$kohadir]: ";
 chomp($input = <STDIN>);
 if ($input) {
     $kohadir=$input;
@@ -61,13 +113,17 @@ print C qq|
 kohadir=$kohadir
 #kohahtmldir=$kohahtmldir
 |;
+print STDERR "$roothomedir/.kohaautobuild.conf written\n" if $verbose_p;
 
 #----------------------------------------------------------
 # which VERSION are we building ?
 #----------------------------------------------------------
-print "\n\nGuessing at next release version.  You may need to enter your SourceForge password...\n";
+print <<EOM;
+
+Guessing the next release version. You may need to enter your SourceForge password.
+EOM
 chdir $kohadir;
-open (CVSLOG, "cvs log misc/buildrelease|");
+open (CVSLOG, "cvs log $self_path|");
 my $symbolicnamessection=0;
 my $symbolicnames;
 my $highestversion;
@@ -78,41 +134,48 @@ my $majorversionrc;
 while (<CVSLOG>) {
     if (/^symbolic names:/) {
 	$symbolicnamessection=1;
+	print STDERR "Scanning symbolic names from cvs output\n" if $verbose_p;
     }
     if ($symbolicnamessection && (/^\s+([^:]*):/)) {
 	my $tag=$1;
-	if ($tag=~/R_(.*)/) {
+	if ($tag=~/(?:R|rel)_(.*)/) {
 	    my $version='';
 	    my $rc=0;
 	    my $id=$1;
-	    $id=~s/-/\./g;
+	    $id =~ s/[-_]/\./g;
+	    print STDERR "Found a tag for release $id\n" if $verbose_p;
 	    if ($id =~/(.*)RC(.*)/) {
 		$version=$1;
 		$rc=$2;
-		$version=~m#(\d+\.\d+)\.#;
+		$version =~ /^(\d+\.\d+)(?:\.|[RC]|$)/;
 		if (versioncompare($version, $majorversion->{$1})) {
 		    $majorversion->{$1}=$version;
 		    $majorversionrc->{$1}=$rc;
+		    print STDERR "Setting major version for $1 to $version $rc\n" if $verbose_p;
 		}
 		if (versioncompare($version, $highestversion)) {
 		    $highestversion=$version;
 		    $released=0;
 		    $highestrc=$rc;
+		    print STDERR "Setting highest version to $highestversion $highestrc\n" if $verbose_p;
 		}
 	    } else {
 		$version=$id;
-		$version=~m#(\d+\.\d+)\.#;
+		$version =~ /^(\d+\.\d+)(?:\.|[RC]|$)/;
 		if (versioncompare($version, $majorversion->{$1})) {
 		    $majorversion->{$1}=$version;
 		    $majorversionrc->{$1}=0;
+		    print STDERR "Setting major version for $1 to $version $rc\n" if $verbose_p;
 		}
 		if (versioncompare($version, $highestversion)) {
 		    $highestversion=$version;
 		    $released=1;
 		    $highestrc=0;
+		    print STDERR "Setting highest version to $highestversion $highestrc\n" if $verbose_p;
 		}
 	    }
 	    $symbolicnames->{$version}->{$rc}=1;
+	    print STDERR "Setting symbolic name mapping for version $version $rc to 1\n" if $verbose_p;
 	}
     }
 }
@@ -120,25 +183,38 @@ while (<CVSLOG>) {
 my $releaseversion='';
 my $currentversion='';
 
-my $branchdata=`grep buildrelease CVS/Entries`;
+my $cvs_entries_path = $self_path;
+$cvs_entries_path =~ s/[^\/]+$/CVS\/Entries/;
+print STDERR "Assuming CVS/Entries is $cvs_entries_path\n" if $verbose_p;
+
+my $branchdata=`grep buildrelease $cvs_entries_path`;
 chomp $branchdata;
 my $branch=(split(m#/#, $branchdata))[5];
-
-if ($branch eq 'Trel-1-2') {
-    $highestversion=$majorversion->{'1.2'};
-    $highestrc=$majorversionrc->{'1.2'};
+$branch =~ s/^T//;
+$branch =~ s/^(?:R|rel)_//;
+$branch =~ s/[-_]/./g;
+print STDERR "Detected branch $branch\n" if $verbose_p;
+
+if ($branch =~ /\S/ && defined $majorversion->{$branch}) {
+    $highestversion=$majorversion->{$branch};
+    $highestrc=$majorversionrc->{$branch};
     ($highestrc) ? ($released=0) : ($released=1);
+    print STDERR "Using highest version for branch $branch\n" if $verbose_p;
 }
 
 if ($released) {
     my @components=split(/\./, $highestversion);
-    $components[$#components]++;
-    $nexthighestversion=join '.', @components;
-    my $minornumber=(split(/\./, $highestversion))[1];
-    if ($minornumber/2 == int($minornumber/2)) {
-	$releaseversion=$nexthighestversion."RC1";
+    if (@components < 3) { # if it's something like just 2.2 or 2.4
+	$releaseversion = $highestversion.".1RC1";
     } else {
-	$releaseversion=$nexthighestversion;
+	$components[$#components]++;
+	$nexthighestversion=join '.', @components;
+	my $minornumber=(split(/\./, $highestversion))[1];
+	if ($minornumber/2 == int($minornumber/2)) {
+	    $releaseversion=$nexthighestversion."RC1";
+	} else {
+	    $releaseversion=$nexthighestversion;
+	}
     }
     $currentversion=$highestversion;
 } else {
@@ -154,7 +230,6 @@ my $tagging_needs_confirmation = 0;
 if ($input =~ /^n/i) {
     print "\nWould you like to rebuild the $currentversion tarball?  Y/[N]: ";
     chomp($input = <STDIN>);
-    print STDERR "releaseversion=($releaseversion), currentversion=($currentversion)\n";#XXXZZZ
     if ($input =~ /^y/i) {
 	$releaseversion=$currentversion;
 	$tagging_needs_confirmation = 1;
@@ -177,10 +252,10 @@ if ($input =~ /^n/i) {
 print "\nWould you like to tag the CVS repository?\n(answer yes if releasing tarball)  Y/[N]: ";
 chomp ($input=<STDIN>);
 my $cvstag=0;
-# FIXME: This means anything other than n will tag; too dangerous?
 if ($input=~/^y/i) {
     $cvstag=1;
 }
+print "The CVS repository ",($cvstag?"WILL BE TAGGED\n":"will not be tagged\n");
 
 
 if ($cvstag && $tagging_needs_confirmation) {
@@ -328,6 +403,7 @@ Your new tarball is located in /tmp/koha-$releaseversion.tar.gz
 |;
 
 
+# Given two version numbers (v1, v2), returns 0 if v1 <= v2, or 1 if v1 > v2
 sub versioncompare {
     my $v1=shift;
     my $v2=shift;
diff --git a/misc/info/ChangeLog b/misc/info/ChangeLog
index b7162c96d2..63f9f19284 100644
--- a/misc/info/ChangeLog
+++ b/misc/info/ChangeLog
@@ -1,3 +1,182 @@
+2004-11-17 13:03:42 GMT	MJ Ray <mjr@dsl.pipex.com>	2.0.2
+
+    Summary:
+      2.0.2 release update
+
+    README: updated version number, noted mod_perl unsafe
+    
+    modified files:
+     README
+
+
+2004-11-05 12:02:53 GMT	MJ Ray <mjr@dsl.pipex.com>	2.0.1-patch-9
+
+    Summary:
+      Bugfixes
+
+    modules/C4/Maintenance.pm
+      Removed superfluous quote() calls after Chris spotted it in 2.1
+      Might fix some catmaint.pl problems.
+    
+    koha.version
+      2.0.2
+    
+    modified files:
+     koha.version modules/C4/Maintainance.pm
+
+
+2004-10-29 19:52:14 GMT	MJ Ray <mjr@dsl.pipex.com>	2.0.1
+
+    Summary:
+      small bugfixes
+    Revision:
+
+    C4::Biblio bugfix from Paul Poulain:
+      drop empty fields, but NOT fields containing 0
+    
+    Remove spanish language option:
+      will be readded when translators answer email
+    
+    README:
+      add comment about fines2.pl
+    
+    Fix for bug 789:
+      shedges: patch -F 3 modules/C4/Search.pm BorrSearchPatch.txt
+
+    modified files:
+     INSTALL Install.pm modules/C4/Biblio.pm modules/C4/Search.pm
+
+
+2004-08-27 23:37:02 GMT	MJ Ray <mjr@dsl.pipex.com>	2.0.0-patch-7
+
+    Summary:
+      Add release docs
+
+    2.0.1 release documentation
+    
+
+    new files:
+     INSTALL
+
+    modified files:
+     README
+
+
+2004-08-24 18:33:51 GMT	MJ Ray <mjr@dsl.pipex.com>	2.0.0-patch-6
+
+    Summary:
+      Fix bug 816
+
+    Fixes bugs.koha.org 816 - use httpd config instead of meta redirect
+
+    modified files:
+     Install.pm
+
+
+2004-07-28 23:19:07 GMT	MJ Ray <mjr@dsl.pipex.com>	2.0.0-patch-5
+
+    Summary:
+      Add kohaRHinstall
+
+    Slightly modified version of this, with Stephen's blessing. Probably
+    needs updating before release, if possible.
+    
+
+    new files:
+     docs/KohaRHinstall.html
+
+
+2004-07-28 23:18:06 GMT	MJ Ray <mjr@dsl.pipex.com>	2.0.0-patch-4
+
+    Summary:
+      Bugfixes (esp. statistics/reports) and documentation
+
+    Complete bug 791 limit fix in C4::Authorities and C4::Maintainance, thanks to Kris Boutilier
+    
+    Check etcdir can be written to, in setetcdir.
+    
+    Added docs/installing_koha_on_debian.html from Joshua (GPL)
+    
+    Added optional parameter to C4::Stats::unfilledreserves to only select today's reserves
+    
+    Used unused parameter $time in intranet-cgi/reservereport.pl to only select today's reserves
+    
+    Updated reports/reports-home.tmpl
+    
+    Added reports/activity.tmpl
+    
+    Added missing function C4::Stats:statsreport
+    
+    Added intranet-cgi/reports/activity.pl
+
+    new files:
+     docs/installing_koha_on_debian.html docs/sources.txt
+     intranet-cgi/reports/activity.pl
+     intranet-html/intranet-tmpl/default/en/reports/activity.tmpl
+
+    modified files:
+     Install.pm intranet-cgi/reservereport.pl
+     intranet-html/intranet-tmpl/default/en/reports/reports-home.tmpl
+     modules/C4/Authorities.pm modules/C4/Circulation/Fines.pm
+     modules/C4/Maintainance.pm modules/C4/Stats.pm
+     opac-cgi/opac-new.pl
+
+
+2004-06-30 15:36:28 GMT	MJ Ray <mjr@dsl.pipex.com>	2.0.0-patch-3
+
+    Summary:
+      Brown paper bag upgrade/Install fixes
+
+    Removed $etcdir from koha.upgrade (no longer needed)
+    
+    Added typo-removed $ to Install.pm
+    
+    modified files:
+     Install.pm koha.upgrade
+
+
+2004-06-30 15:13:48 GMT	MJ Ray <mjr@dsl.pipex.com>	2.0.0-patch-2
+
+    Summary:
+      Bugfixes
+
+    Fix perldoc C4::Search
+    
+    Fix search parameter display bug 196
+    
+    Half-fix thesaurus word search bug 791 - thanks to M. Parienti
+    
+    Fix member.pl search bug 789
+    
+    removed files:
+     scripts/misc/my.cnf.koha.jsqrGh
+
+    modified files:
+     intranet-cgi/admin/thesaurus.pl modules/C4/Search.pm
+     opac-html/opac-tmpl/css/en/opac-searchresults.tmpl
+     opac-html/opac-tmpl/css/fr/opac-searchresults.tmpl
+     opac-html/opac-tmpl/default/de/opac-searchresults.tmpl
+     opac-html/opac-tmpl/default/en/opac-searchresults.tmpl
+     opac-html/opac-tmpl/default/fr/opac-searchresults.tmpl
+     opac-html/opac-tmpl/default/pl/opac-searchresults.tmpl
+     opac-html/opac-tmpl/default/zh-TW/opac-searchresults.tmpl
+     opac-html/opac-tmpl/vanilla/en/opac-searchresults.tmpl
+
+
+2004-06-30 12:15:25 GMT	MJ Ray <mjr@dsl.pipex.com>	2.0.0-patch-1
+
+    Summary:
+      Installation bugfixes
+
+    Fix mysql command syntax in Install.pm (database must be after -e in some v3)
+    
+    Removed FIXMEs from upgradecomplete by moving message inside Install.pm
+    
+    Fixed koha.upgrade mysql password handling
+    
+    Removed duplicate restoremycnf() calls from Install.pm - this is installer.pl's concern
+
+
 2002-10-30  Andrew Arensburger  <arensb@baa.ooblick.com>
 
 	* koha.conf.in (added) Ancillary files for new installer.
diff --git a/misc/info/INSTALL b/misc/info/INSTALL
new file mode 100644
index 0000000000..f19ed1b8d6
--- /dev/null
+++ b/misc/info/INSTALL
@@ -0,0 +1,40 @@
+Koha release 2.0.1 (stable series, first point release)
+28 August 2004 MJR
+
+Koha is distributed under the GNU GPL. Please read the file LICENSE for
+more details.
+
+To install the system please run: perl installer.pl
+
+This will:
+ 1. Check for missing perl modules;
+ 2. Ask some questions and run some programs to collect system information;
+ 3. Write an apache httpd.conf file;
+ 4. Copy koha to the installation directory;
+ 5. Create a mysql database and load in basic data;
+ 6. Offer to try restarting apache;
+ 7. Invite you to fill in a survey from koha's developers.
+
+perl 5.6.1 or higher is required.
+
+The perl modules required are:
+  DBI, Date::Manip, DBD::mysql, HTML::Template, Digest::MD5,
+  MARC::Record, Mail::Sendmail, Event
+Optionally, we can also use:
+  Net::Z3950
+You can install packages for these, or CPAN builds. The installer will
+suggest CPAN builds, but it's your choice.
+
+After installation, you need to make sure the generated koha-httpd.conf
+file is "Include"d into your apache configuration and restart apache.
+You may also need to configure daemons, depending on your installation.
+
+A common need is to add the fines2.pl script to crontab. You will need
+to put perl -I/path/to/koha/intranet/modules /path/to/fines2.pl, so
+that it can find the koha modules.
+
+If you wish to install without being root, please set the "etcdir" and
+"prefix" environment variables before running the installer. etcdir
+will be the configuration directory and prefix will be the installation
+root directory.
+
diff --git a/misc/info/README b/misc/info/README
index 456c4917ba..981ebb8a2a 100644
--- a/misc/info/README
+++ b/misc/info/README
@@ -1,7 +1,16 @@
-19/7/00 chris@katipo.co.nz
+Koha release 2.0.2 (2.0 stable series, second point release)
+17 November 2004 MJR
 
-Koha is distributed under the GPL license, please read the file LICENSE for
+Koha is distributed under the GNU GPL. Please read the file LICENSE for
 more details.
 
-To install the system please run installer.pl
+To install the system, please see the INSTALL file.
+
+To upgrade an existing system, please run: perl koha.upgrade
+
+Please report any bugs to the koha mailing lists or bug tracker and we
+will try to fix them in a future release if possible. The main koha web
+site is http://www.koha.org/
+
+Running under mod_perl is not advised for this version.
 
diff --git a/misc/koha.upgrade b/misc/koha.upgrade
index d0a1fe079c..0449c10494 100644
--- a/misc/koha.upgrade
+++ b/misc/koha.upgrade
@@ -14,6 +14,7 @@ Install::setetcdir($ENV{etcdir}||'/etc');
 my $input;
 loadconfigfile();
 
+my $curr_ver = Install::getkohaversion();
 $::newversion=`cat koha.version`;
 chomp $::newversion;
 Install::setkohaversion $::newversion;
@@ -23,7 +24,7 @@ if ($::newversion =~ /RC/) {
     releasecandidatewarning();
 }
 
-my $answer = showmessage(getmessage('WelcomeToUpgrader',[$::newversion]),'yn','n');
+my $answer = showmessage(getmessage('WelcomeToUpgrader',[$curr_ver,$::newversion]),'yn','n');
 if ($answer eq "Y" || $answer eq "y") {
 	print "Great! continuing upgrade... \n";
 } else {
@@ -33,11 +34,13 @@ if ($answer eq "Y" || $answer eq "y") {
 
 Install::setkohaversion($::newversion);
 checkperlmodules();
+backupmycnf();
 backupkoha();
 getapacheinfo();
 installfiles();
 # custom templates warning added to installfiles();
 updatedatabase();
+restoremycnf();
 finalizeconfigfile();
 
 showmessage(getmessage('UpgradeCompleted',['FIXME','FIXME','FIXME','FIXME','FIXME','FIXME']),'PressEnter');
diff --git a/misc/merge_authority.pl b/misc/merge_authority.pl
new file mode 100755
index 0000000000..a046d83360
--- /dev/null
+++ b/misc/merge_authority.pl
@@ -0,0 +1,116 @@
+#!/usr/bin/perl
+# script that rebuild thesaurus from biblio table.
+
+use strict;
+
+# Koha modules used
+use MARC::File::USMARC;
+use MARC::Record;
+use MARC::Batch;
+use C4::Context;
+use C4::Biblio;
+use C4::AuthoritiesMarc;
+use Time::HiRes qw(gettimeofday);
+
+use Getopt::Long;
+my ($version, $verbose, $mergefrom,$mergeto,$noconfirm);
+GetOptions(
+    'h' => \$version,
+    'f:s' => \$mergefrom,
+    't:s' => \$mergeto,
+    'v' => \$verbose,
+	'n' => \$noconfirm,
+);
+
+if ($version || ($mergefrom eq '')) {
+	print <<EOF
+Script to merge an authority into another
+parameters :
+\th : this version/help screen
+\tv : verbose mode (show many things on screen)
+\tf : the authority number to merge (the one that can be deleted after the merge).
+\tt : the authority number where to merge
+\tn : don't ask for confirmation (useful for batch mergings, should not be used on command line)
+
+All biblios with the authority in -t will be modified to be "connected" to authority -f
+SAMPLE :
+./merge_authority.pl -f 2457 -t 531
+
+Before doing anything, the script will show both authorities and ask for confirmation. Of course, you can merge only 2 authorities of the same kind.
+EOF
+;#
+die;
+}#/'
+
+my $dbh = C4::Context->dbh;
+# my @subf = $subfields =~ /(##\d\d\d##.)/g;
+
+$|=1; # flushes output
+my $authfrom = AUTHgetauthority($dbh,$mergefrom);
+my $authto = AUTHgetauthority($dbh,$mergeto);
+
+my $authtypecodefrom = AUTHfind_authtypecode($dbh,$mergefrom);
+my $authtypecodeto = AUTHfind_authtypecode($dbh,$mergeto);
+
+unless ($noconfirm) {
+	print "************\n";
+	print "You will merge authority : $mergefrom ($authtypecodefrom)\n".$authfrom->as_formatted;
+	print "\n*************\n";
+	print "Into authority : $mergeto ($authtypecodeto)\n".$authto->as_formatted;
+	print "\n\nDo you confirm (enter YES)?";
+	my $confirm = <STDIN>;
+	chop $confirm;
+	unless (uc($confirm) eq 'YES' and $authtypecodefrom eq $authtypecodeto) {
+		print "IMPOSSIBLE : authorities are not of the same type ($authtypecodefrom vs $authtypecodeto) !!!\n" if $authtypecodefrom ne $authtypecodeto;
+		print "Merge cancelled\n";
+		exit;
+	}
+}
+my $starttime = gettimeofday;
+print "Merging\n" unless $noconfirm;
+
+# search the tag to report
+my $sth = $dbh->prepare("select auth_tag_to_report from auth_types where authtypecode=?");
+$sth->execute($authtypecodefrom);
+my ($auth_tag_to_report) = $sth->fetchrow;
+# my $record_to_report = $authto->field($auth_tag_to_report);
+print "Reporting authority tag $auth_tag_to_report :\n" if $verbose;
+my @record_to = $authto->field($auth_tag_to_report)->subfields();
+my @record_from = $authfrom->field($auth_tag_to_report)->subfields();
+
+# search all biblio tags using this authority.
+$sth = $dbh->prepare("select distinct tagfield from marc_subfield_structure where authtypecode=?");
+$sth->execute($authtypecodefrom);
+my $tags_using_authtype;
+while (my ($tagfield) = $sth->fetchrow) {
+	$tags_using_authtype.= "'".$tagfield."',";
+}
+chop $tags_using_authtype;
+# now, find every biblio using this authority
+my $query = "select bibid,tag,tag_indicator,tagorder,subfieldcode,subfieldorder from marc_subfield_table where tag in ($tags_using_authtype) and subfieldcode='9' and subfieldvalue='$mergefrom'";
+$sth = $dbh->prepare($query);
+$sth->execute;
+my $nbdone;
+# and delete entries before recreating them
+while (my ($bibid,$tag,$tag_indicator,$tagorder,$subfieldcode,$subfieldorder) = $sth->fetchrow) {
+	my $biblio = MARCgetbiblio($dbh,$bibid);
+	print "BEFORE : ".$biblio->as_formatted."\n" if $verbose;
+	# now, we know what uses the authority & where.
+	# delete all subfields that are in the same tag/tagorder and that are in the authority (& that are not in tab ignore in the biblio)
+	# then recreate them with the new authority.
+	foreach my $subfield (@record_from) {
+		&MARCdelsubfield($dbh,$bibid,$tag,$tagorder,$subfield->[0]);
+	}
+	&MARCdelsubfield($dbh,$bibid,$tag,$tagorder,'9');
+	foreach my $subfield (@record_to) {
+		&MARCaddsubfield($dbh,$bibid,$tag,$tag_indicator,$tagorder,$subfield->[0],$subfieldorder,$subfield->[1]);
+	}
+	&MARCaddsubfield($dbh,$bibid,$tag,$tag_indicator,$tagorder,'9',$subfieldorder,$mergeto);
+	my $biblio = MARCgetbiblio($dbh,$bibid);
+	print "AFTER : ".$biblio->as_formatted."\n" if $verbose;
+	$nbdone++;
+# 	&MARCdelsubfield($dbh,$bibid,$tag,$tagorder,$subfieldcode,$subfieldorder);
+	
+}
+my $timeneeded = gettimeofday - $starttime;
+print "$nbdone authorities done in $timeneeded seconds" unless $noconfirm;
\ No newline at end of file
diff --git a/misc/migration_tools/build6xx.pl b/misc/migration_tools/build6xx.pl
new file mode 100644
index 0000000000..b8e2732b5b
--- /dev/null
+++ b/misc/migration_tools/build6xx.pl
@@ -0,0 +1,245 @@
+#!/usr/bin/perl
+# script that rebuild thesaurus from biblio table.
+
+# delete  FROM  `marc_subfield_table`  WHERE tag =  "606" AND subfieldcode = 9;
+use strict;
+
+# Koha modules used
+use MARC::File::USMARC;
+use MARC::Record;
+use MARC::Batch;
+use C4::Context;
+use C4::Biblio;
+use C4::AuthoritiesMarc;
+use Time::HiRes qw(gettimeofday);
+
+use Getopt::Long;
+my ( $input_marc_file, $number) = ('',0);
+my ($version, $verbose, $test_parameter, $field,$delete,$category,$subfields);
+GetOptions(
+    'h' => \$version,
+    'd' => \$delete,
+    't' => \$test_parameter,
+    's:s' => \$subfields,
+    'v' => \$verbose,
+    'c:s' => \$category,
+);
+
+if ($version || ($category eq '')) {
+	print <<EOF
+small script to recreate a authority table into Koha.
+parameters :
+\tc : thesaurus category. Can be filled with anything, the NC is hardcoded. But mandatory to confirm that you want to rebuild 6xx
+\d : delete every entry of the selected category before doing work.
+
+SAMPLES :
+ ./build6xx.pl -c NC -d 
+EOF
+;#
+die;
+}
+
+my $dbh = C4::Context->dbh;
+my @subf = $subfields =~ /(##\d\d\d##.)/g;
+if ($delete) {
+	print "deleting thesaurus\n";
+	my $del1 = $dbh->prepare("delete from auth_subfield_table where authid=?");
+	my $del2 = $dbh->prepare("delete from auth_word where authid=?");
+	my $sth = $dbh->prepare("select authid from auth_header where authtypecode='NC'");
+	$sth->execute;
+	while (my ($authid) = $sth->fetchrow) {
+		$del1->execute($authid);
+		$del2->execute($authid);
+	}
+	$dbh->do("delete from auth_header where authtypecode='NC'");
+	$dbh->do("delete from marc_subfield_table where tag='606' and subfieldcode='9'");
+	$dbh->do("delete from marc_word where tagsubfield='6069'");
+}
+
+if ($test_parameter) {
+	print "TESTING MODE ONLY\n    DOING NOTHING\n===============\n";
+}
+$|=1; # flushes output
+my $starttime = gettimeofday;
+my $sth = $dbh->prepare("select bibid from marc_biblio");
+$sth->execute;
+my $i=1;
+my %alreadydone;
+
+# search biblios to "connect" to an authority with any number of $x (limited to 4 $x in this script)
+my $sthBIBLIOS = $dbh->prepare("select distinct m1.bibid,m1.tag,m1.tagorder,m1.subfieldorder from marc_subfield_table as m1 where tag in (606) and subfieldcode='a' and subfieldvalue=?");
+my $sthBIBLIOSx = $dbh->prepare("select distinct m1.bibid,m1.tag,m1.tagorder,m1.subfieldorder from marc_subfield_table as m1 left join marc_subfield_table as m2 on m1.bibid=m2.bibid where m1.tag in (606) and m1.subfieldcode='a' and m2.subfieldcode='x' and m1.subfieldvalue=? and m2.subfieldvalue=?");
+my $sthBIBLIOSxx = $dbh->prepare("select distinct m1.bibid,m1.tag,m1.tagorder,m1.subfieldorder from marc_subfield_table as m1 left join marc_subfield_table as m2 on m1.bibid=m2.bibid left join marc_subfield_table as m3 on m1.bibid=m3.bibid where m1.tag in (606) and m1.subfieldcode='a' and m2.subfieldcode='x' and m3.subfieldcode='x' and m1.subfieldvalue=? and m2.subfieldvalue=? and m3.subfieldvalue=?");
+my $sthBIBLIOSxxx = $dbh->prepare("select distinct m1.bibid,m1.tag,m1.tagorder,m1.subfieldorder from marc_subfield_table as m1 left join marc_subfield_table as m2 on m1.bibid=m2.bibid left join marc_subfield_table as m3 on m1.bibid=m4.bibid left join marc_subfield_table as m4 on m1.bibid=m4.bibid where m1.tag in (606) and m1.subfieldcode='a' and m2.subfieldcode='x' and m3.subfieldcode='x' and m4.subfieldcode='x' and m1.subfieldvalue=? and m2.subfieldvalue=? and m3.subfieldvalue=? and m4.subfieldvalue=?");
+my $sthBIBLIOSxxxx = $dbh->prepare("select distinct m1.bibid,m1.tag,m1.tagorder,m1.subfieldorder from marc_subfield_table as m1 left join marc_subfield_table as m2 on m1.bibid=m2.bibid left join marc_subfield_table as m3 on m1.bibid=m4.bibid left join marc_subfield_table as m4 on m1.bibid=m4.bibid left join marc_subfield_table as m5 on m1.bibid=m5.bibid where m1.tag in (606) and m1.subfieldcode='a' and m2.subfieldcode='x' and m3.subfieldcode='x' and m4.subfieldcode='x' and m5.subfieldcode='x' and m1.subfieldvalue=? and m2.subfieldvalue=? and m3.subfieldvalue=? and m4.subfieldvalue=? and m5.subfieldvalue=?");
+
+# loop through each biblio
+while (my ($bibid) = $sth->fetchrow) {
+	my $record = MARCgetbiblio($dbh,$bibid);
+	my $timeneeded = gettimeofday - $starttime;
+	print "$i in $timeneeded s\n" unless ($i % 50);
+	foreach my $field ($record->field(995)) {
+		$record->delete_field($field);
+	}
+	my $totdone=0;
+	my $authid;
+	# search the 606 field(s)
+	foreach my $field ($record->field("606")) {
+		foreach my $authentry ($field->subfield("a")) {
+			# the hashentry variable contains all $x fields and the $a in a single string. Used to differenciate
+			# $xsomething$aelse and $asomething else
+			my $hashentry = $authentry;
+			foreach my $x ($field->subfield('x')) {
+				$hashentry.=" -- $x";
+			}
+			# remove é,à,$e...
+			# all the same for mysql, but NOT for perl hashes !
+			# without those lines, tôt is not tot and patée is not patee
+			$hashentry =~ s/é|ê|è/e/g;
+			$hashentry =~ s/â|à/a/g;
+			$hashentry =~ s/î/i/g;
+			$hashentry =~ s/ô/o/g;
+			$hashentry =~ s/ù|û/u/g;
+			# uppercase all, in case of typing error.
+			$hashentry = uc($hashentry);
+			$totdone++;
+			if ($alreadydone{$hashentry}) {
+				$authid = $alreadydone{$hashentry};
+				print ".";
+			} else {
+				print "*";
+				#create authority.
+				my $authorityRecord = MARC::Record->new();
+				my $newfield = MARC::Field->new(250,'','','a' => "".$authentry);
+				foreach my $x ($field->subfield('x')) {
+					$newfield->add_subfields('x' => $x);
+				}
+				foreach my $z ($field->subfield('z')) {
+					$newfield->add_subfields('z' => $z);
+				}
+				$authorityRecord->insert_fields_ordered($newfield);
+				$authid=AUTHaddauthority($dbh,$authorityRecord,'','NC');
+				$alreadydone{$hashentry} = $authid;
+				# we have the authority number, now we update all biblios that use this authority...
+				my @x = $field->subfield('x'); # depending on the number of $x in the subfield
+				if ($#x eq -1) { # no $x
+					$sthBIBLIOS->execute($authentry);
+					while (my ($bibid,$tag,$tagorder,$subfieldorder) = $sthBIBLIOS->fetchrow) {
+						# check that the field does not already have a $x (if it has, it will or has been managed by another authority
+						my $inbiblio = MARCgetbiblio($dbh,$bibid);
+						my $isOK = 0;
+						# loop in each 606 field
+						foreach my $in606 ($inbiblio->field('606')) {
+							my $inEntry = $in606->subfield('a');
+							# and rebuild the $x -- $x -- $a string (like for $hashentry, few lines before)
+							foreach my $x ($in606->subfield('x')) {
+								$inEntry.=" -- $x";
+							}
+							$inEntry =~ s/é|ê|è/e/g;
+							$inEntry =~ s/â|à/a/g;
+							$inEntry =~ s/î/i/g;
+							$inEntry =~ s/ô/o/g;
+							$inEntry =~ s/ù|û/u/g;
+							$inEntry = uc($inEntry);
+							# ok, it's confirmed that we must add the $9 subfield for this biblio, so...
+							$isOK=1 if $inEntry eq $hashentry;
+						}
+						# ... add it !
+						C4::Biblio::MARCaddsubfield($dbh,$bibid,$tag,'',$tagorder,9,$subfieldorder,$authid) if $isOK;
+					}
+				}
+				if ($#x eq 0) { # one $x
+					$sthBIBLIOSx->execute($authentry,$x[0]);
+					while (my ($bibid,$tag,$tagorder,$subfieldorder) = $sthBIBLIOSx->fetchrow) {
+						my $inbiblio = MARCgetbiblio($dbh,$bibid);
+						my $isOK = 0;
+						foreach my $in606 ($inbiblio->field('606')) {
+							my $inEntry = $in606->subfield('a');
+							foreach my $x ($in606->subfield('x')) {
+								$inEntry.=" -- $x";
+							}
+							$inEntry =~ s/é|ê|è/e/g;
+							$inEntry =~ s/â|à/a/g;
+							$inEntry =~ s/î/i/g;
+							$inEntry =~ s/ô/o/g;
+							$inEntry =~ s/ù|û/u/g;
+							$inEntry = uc($inEntry);
+							$isOK=1 if $inEntry eq $hashentry;
+						}
+						C4::Biblio::MARCaddsubfield($dbh,$bibid,$tag,'',$tagorder,9,$subfieldorder,$authid) if $isOK;
+					}
+				}
+				if ($#x eq 1) { # two $x
+					$sthBIBLIOSxx->execute($authentry,$x[0],$x[1]);
+					while (my ($bibid,$tag,$tagorder,$subfieldorder) = $sthBIBLIOSxx->fetchrow) {
+						my $inbiblio = MARCgetbiblio($dbh,$bibid);
+						my $isOK = 0;
+						foreach my $in606 ($inbiblio->field('606')) {
+							my $inEntry = $in606->subfield('a');
+							foreach my $x ($in606->subfield('x')) {
+								$inEntry.=" -- $x";
+							}
+							$inEntry =~ s/é|ê|è/e/g;
+							$inEntry =~ s/â|à/a/g;
+							$inEntry =~ s/î/i/g;
+							$inEntry =~ s/ô/o/g;
+							$inEntry =~ s/ù|û/u/g;
+							$inEntry = uc($inEntry);
+							$isOK=1 if $inEntry eq $hashentry;
+						}
+						C4::Biblio::MARCaddsubfield($dbh,$bibid,$tag,'',$tagorder,9,$subfieldorder,$authid) if $isOK;
+					}
+				}
+				if ($#x eq 2) { # 3 $x
+					$sthBIBLIOSxxx->execute($authentry,$x[0],$x[1],$x[2]);
+					while (my ($bibid,$tag,$tagorder,$subfieldorder) = $sthBIBLIOSxxx->fetchrow) {
+						my $inbiblio = MARCgetbiblio($dbh,$bibid);
+						my $isOK = 0;
+						foreach my $in606 ($inbiblio->field('606')) {
+							my $inEntry = $in606->subfield('a');
+							foreach my $x ($in606->subfield('x')) {
+								$inEntry.=" -- $x";
+							}
+							$inEntry =~ s/é|ê|è/e/g;
+							$inEntry =~ s/â|à/a/g;
+							$inEntry =~ s/î/i/g;
+							$inEntry =~ s/ô/o/g;
+							$inEntry =~ s/ù|û/u/g;
+							$inEntry = uc($inEntry);
+							$isOK=1 if $inEntry eq $hashentry;
+						}
+						C4::Biblio::MARCaddsubfield($dbh,$bibid,$tag,'',$tagorder,9,$subfieldorder,$authid) if $isOK;
+					}
+				}
+				if ($#x eq 3) { # 3 $x
+					$sthBIBLIOSxxxx->execute($authentry,$x[0],$x[1],$x[2],$x[3]);
+					while (my ($bibid,$tag,$tagorder,$subfieldorder) = $sthBIBLIOSxxxx->fetchrow) {
+						my $inbiblio = MARCgetbiblio($dbh,$bibid);
+						my $isOK = 0;
+						foreach my $in606 ($inbiblio->field('606')) {
+							my $inEntry = $in606->subfield('a');
+							foreach my $x ($in606->subfield('x')) {
+								$inEntry.=" -- $x";
+							}
+							$inEntry =~ s/é|ê|è/e/g;
+							$inEntry =~ s/â|à/a/g;
+							$inEntry =~ s/î/i/g;
+							$inEntry =~ s/ô/o/g;
+							$inEntry =~ s/ù|û/u/g;
+							$inEntry = uc($inEntry);
+							$isOK=1 if $inEntry eq $hashentry;
+						}
+						C4::Biblio::MARCaddsubfield($dbh,$bibid,$tag,'',$tagorder,9,$subfieldorder,$authid) if $isOK;
+					}
+				}
+				if ($#x >4) {
+					# too many $x, not handled, warn the developper that tries to migrate
+					print "warning there is ".$#x.'$x values';
+				}
+			}
+		}
+	}
+	$i++;
+}
+my $timeneeded = gettimeofday - $starttime;
+print "$i entries done in $timeneeded seconds (".($i/$timeneeded)." per second)\n";
diff --git a/misc/migration_tools/buildEDITORS.pl b/misc/migration_tools/buildEDITORS.pl
new file mode 100755
index 0000000000..b844c39f50
--- /dev/null
+++ b/misc/migration_tools/buildEDITORS.pl
@@ -0,0 +1,249 @@
+#!/usr/bin/perl
+# script that rebuild EDITORS
+
+use strict;
+
+# Koha modules used
+use MARC::File::USMARC;
+use MARC::Record;
+use MARC::Batch;
+use C4::Context;
+use C4::Biblio;
+use C4::AuthoritiesMarc;
+use Time::HiRes qw(gettimeofday);
+
+use Getopt::Long;
+my ( $input_marc_file, $number) = ('',0);
+my ($version, $verbose, $test_parameter, $confirm,$delete);
+GetOptions(
+    'h' => \$version,
+    'd' => \$delete,
+    't' => \$test_parameter,
+    'v' => \$verbose,
+    'c' => \$confirm,
+);
+
+if ($version or !$confirm) {
+	print <<EOF
+small script to recreate a authority table into Koha.
+This will parse all your biblios to recreate isbn / editor / collections for the unimarc_210c and unimarc_225a plugins.
+
+Remember those plugins will work only if you have an EDITORS authority type, with
+\t200a being the first 2 parts of an ISBN
+\t200b being the editor name
+\t200c (repeatable) being the series title
+
+parameters :
+\t-c : confirmation flag. the script will run only with this flag. Otherwise, it will just show this help screen.
+\t-d : delete existing EDITORS before rebuilding them
+\t-t : test parameters : run the script but don't create really the EDITORS
+EOF
+;#'
+
+exit;
+}
+
+my $dbh = C4::Context->dbh;
+if ($delete) {
+	print "deleting EDITORS\n";
+	my $del1 = $dbh->prepare("delete from auth_subfield_table where authid=?");
+	my $del2 = $dbh->prepare("delete from auth_word where authid=?");
+	my $sth = $dbh->prepare("select authid from auth_header where authtypecode='EDITORS'");
+	$sth->execute;
+	while (my ($authid) = $sth->fetchrow) {
+		$del1->execute($authid);
+		$del2->execute($authid);
+	}
+	$dbh->do("delete from auth_header where authtypecode='EDITORS'");
+}
+
+if ($test_parameter) {
+	print "TESTING MODE ONLY\n    DOING NOTHING\n===============\n";
+}
+$|=1; # flushes output
+my $starttime = gettimeofday;
+my $sth = $dbh->prepare("select bibid from marc_biblio");
+$sth->execute;
+my $i=1;
+my %alreadydone;
+my $counter;
+my %hash;
+while (my ($bibid) = $sth->fetchrow) {
+	my $record = MARCgetbiblio($dbh,$bibid);
+	my $isbnField = $record->field('010');
+	next unless $isbnField;
+	my $isbn=$isbnField->subfield('a');
+	my $seg1;
+	if(substr($isbn, 0, 1) <=7) {
+		$seg1 = substr($isbn, 0, 1);
+	} elsif(substr($isbn, 0, 2) <= 94) {
+		$seg1 = substr($isbn, 0, 2);
+	} elsif(substr($isbn, 0, 3) <= 995) {
+		$seg1 = substr($isbn, 0, 3);
+	} elsif(substr($isbn, 0, 4) <= 9989) {
+		$seg1 = substr($isbn, 0, 4);
+	} else {
+		$seg1 = substr($isbn, 0, 5);
+	}
+	my $x = substr($isbn, length($seg1));
+	my $seg2;
+	if(substr($x, 0, 2) <= 19) {
+# 		if(sTmp2 < 10) sTmp2 = "0" sTmp2;
+		$seg2 = substr($x, 0, 2);
+	} elsif(substr($x, 0, 3) <= 699) {
+		$seg2 = substr($x, 0, 3);
+	} elsif(substr($x, 0, 4) <= 8399) {
+		$seg2 = substr($x, 0, 4);
+	} elsif(substr($x, 0, 5) <= 89999) {
+		$seg2 = substr($x, 0, 5);
+	} elsif(substr($x, 0, 6) <= 9499999) {
+		$seg2 = substr($x, 0, 6);
+	} else {
+		$seg2 = substr($x, 0, 7);
+	}
+	$counter++;
+	print ".";
+	my $timeneeded = gettimeofday - $starttime;
+	print "$counter in $timeneeded s\n" unless ($counter % 100);
+	
+	my $field = $record->field('210');
+	my $editor;
+	$editor=$field->subfield('c') if $field;
+	
+	$field = $record->field('225');
+	my $collection;
+	$collection=$field->subfield('a') if $field;
+	
+# 	print "WARNING : editor empty for ".$record->as_formatted unless $editor and !$verbose;
+
+	$hash{$seg1.$seg2}->{editors} = $editor unless ($hash{$seg1.$seg2}->{editors});
+	$hash{$seg1.$seg2}->{collections}->{$collection}++ if $collection;
+}
+
+foreach my $isbnstart (sort keys %hash) {
+	print "$isbnstart -- ".$hash{$isbnstart}->{editors} if $verbose;
+	my $collections = $hash{$isbnstart}->{collections};
+	my $seriestitlelist;
+	foreach my $collection (sort keys %$collections) {
+		print " CC $collection : ".$collections->{$collection} if $verbose;
+		$seriestitlelist.=$collection."|";
+	}
+	my $authorityRecord = MARC::Record->new();
+	my $newfield = MARC::Field->new(200,'','','a' => "".$isbnstart,
+												'b' => "".$hash{$isbnstart}->{editors},
+												'c' => "".$seriestitlelist);
+	$authorityRecord->insert_fields_ordered($newfield);
+	my $authid=AUTHaddauthority($dbh,$authorityRecord,'','EDITORS');
+
+# 	print $authorityRecord->as_formatted."\n";
+	print "\n" if $verbose;
+}
+exit;
+
+# 	my $timeneeded = gettimeofday - $starttime;
+# 	print "$i in $timeneeded s\n" unless ($i % 50);
+# 	foreach my $field ($record->field(995)) {
+# 		$record->delete_field($field);
+# 	}
+# 	my $totdone=0;
+# 	my $authid;
+# 	foreach my $fieldnumber (('710','711','712')) {
+# 		foreach my $field ($record->field($fieldnumber)) {
+# 	# 		print "=>".$field->as_formatted."\n";
+# 			foreach my $authentry ($field->subfield("a")) {
+# 				my $hashentry = $authentry;
+# 				# la particularité de ce script là, c'est que l'entrée dans la table d'autorité est $a -- $b (et pas $x -- $x -- $x -- $a comme pour les autorités NC)
+# 				# si nécessaire, compléter avec le $c (n'existe pas dans le fichier que j'ai migré avec cette moulinette
+# 				# supprimer les accents, certaines entrées sont sans, d'autres avec !
+# 				# mysql ne différencie pas, mais les hash perl oui !
+# 				$hashentry =~ s/é|ê|è/e/g;
+# 				$hashentry =~ s/â|à/a/g;
+# 				$hashentry =~ s/î/i/g;
+# 				$hashentry =~ s/ô/o/g;
+# 				$hashentry =~ s/ù|û/u/g;
+# 				$hashentry = uc($hashentry);
+# 				print "==>$hashentry" if $hashentry =~ /.*ETATS.*/;
+# 				$totdone++;
+# 				if ($alreadydone{$hashentry}) {
+# 					$authid = $alreadydone{$hashentry};
+# 					print ".";
+# 				} else {
+# 					print "*";
+# 					#create authority.
+# 					my $authorityRecord = MARC::Record->new();
+# 					my $newfield = MARC::Field->new(210,'','','a' => "".$authentry, 
+# 												'b' => "".$field->subfield('b'),
+# 												'c' => "".$field->subfield('c'),
+# 												);
+# 					$authorityRecord->insert_fields_ordered($newfield);
+# 					$authid=AUTHaddauthority($dbh,$authorityRecord,'','CO');
+# 					$alreadydone{$hashentry} = $authid;
+# 					# OK, on garde la notice d'autorité, on cherche les notices biblio et on les met à jour...
+# 					if ($fieldnumber eq '710') {
+# 						$sthBIBLIOS710->execute($authentry);
+# 						while (my ($bibid,$tag,$tagorder,$subfieldorder) = $sthBIBLIOS710->fetchrow) {
+# 							my $inbiblio = MARCgetbiblio($dbh,$bibid);
+# 							my $isOK = 0;
+# 							foreach my $in7xx ($inbiblio->field($fieldnumber)) {
+# 								# !!!!! ici, il faut reconstruire l'entrée de la table de hachage comme ci dessus
+# 								# sinon, 
+# 								my $inEntry = $in7xx->subfield('a');
+# 								$inEntry =~ s/é|ê|è/e/g;
+# 								$inEntry =~ s/â|à/a/g;
+# 								$inEntry =~ s/î/i/g;
+# 								$inEntry =~ s/ô/o/g;
+# 								$inEntry =~ s/ù|û/u/g;
+# 								$inEntry = uc($inEntry);
+# 								$isOK=1 if $inEntry eq $hashentry;
+# 							}
+# 							C4::Biblio::MARCaddsubfield($dbh,$bibid,$tag,'',$tagorder,9,$subfieldorder,$authid) if $isOK;
+# 						}
+# 					}
+# 					if ($fieldnumber eq '711') {
+# 						$sthBIBLIOS711->execute($authentry);
+# 						while (my ($bibid,$tag,$tagorder,$subfieldorder) = $sthBIBLIOS711->fetchrow) {
+# 							my $inbiblio = MARCgetbiblio($dbh,$bibid);
+# 							my $isOK = 0;
+# 							foreach my $in7xx ($inbiblio->field($fieldnumber)) {
+# 								# !!!!! ici, il faut reconstruire l'entrée de la table de hachage comme ci dessus
+# 								# sinon, 
+# 								my $inEntry = $in7xx->subfield('a');
+# 								$inEntry =~ s/é|ê|è/e/g;
+# 								$inEntry =~ s/â|à/a/g;
+# 								$inEntry =~ s/î/i/g;
+# 								$inEntry =~ s/ô/o/g;
+# 								$inEntry =~ s/ù|û/u/g;
+# 								$inEntry = uc($inEntry);
+# 								$isOK=1 if $inEntry eq $hashentry;
+# 							}
+# 							C4::Biblio::MARCaddsubfield($dbh,$bibid,$tag,'',$tagorder,9,$subfieldorder,$authid) if $isOK;
+# 						}
+# 					}
+# 					if ($fieldnumber eq '712') {
+# 						$sthBIBLIOS712->execute($authentry);
+# 						while (my ($bibid,$tag,$tagorder,$subfieldorder) = $sthBIBLIOS712->fetchrow) {
+# 							my $inbiblio = MARCgetbiblio($dbh,$bibid);
+# 							my $isOK = 0;
+# 							foreach my $in7xx ($inbiblio->field($fieldnumber)) {
+# 								# !!!!! ici, il faut reconstruire l'entrée de la table de hachage comme ci dessus
+# 								# sinon, 
+# 								my $inEntry = $in7xx->subfield('a');
+# 								$inEntry =~ s/é|ê|è/e/g;
+# 								$inEntry =~ s/â|à/a/g;
+# 								$inEntry =~ s/î/i/g;
+# 								$inEntry =~ s/ô/o/g;
+# 								$inEntry =~ s/ù|û/u/g;
+# 								$inEntry = uc($inEntry);
+# 								$isOK=1 if $inEntry eq $hashentry;
+# 							}
+# 							C4::Biblio::MARCaddsubfield($dbh,$bibid,$tag,'',$tagorder,9,$subfieldorder,$authid) if $isOK;
+# 						}
+# 					}
+# 				}
+# 			}
+# 		}
+# 	}
+# 	$i++;
+# }
+# my $timeneeded = gettimeofday - $starttime;
+# print "$i entries done in $timeneeded seconds (".($i/$timeneeded)." per second)\n";
diff --git a/misc/migration_tools/check_marc_definition.pl b/misc/migration_tools/check_marc_definition.pl
new file mode 100755
index 0000000000..6fc0491985
--- /dev/null
+++ b/misc/migration_tools/check_marc_definition.pl
@@ -0,0 +1,47 @@
+#!/usr/bin/perl
+# script that rebuild thesaurus from biblio table.
+
+use strict;
+
+# Koha modules used
+use MARC::File::USMARC;
+use MARC::Record;
+use MARC::Batch;
+use C4::Context;
+use C4::Biblio;
+use C4::AuthoritiesMarc;
+use Time::HiRes qw(gettimeofday);
+
+use Getopt::Long;
+my ( $input_marc_file, $number) = ('',0);
+my ($version,$confirm);
+GetOptions(
+    'h' => \$version,
+    'c' => \$confirm,
+);
+
+if ($version || ($confirm eq '')) {
+	print <<EOF
+Script that compare the datas in the DB and the setting of MARC structure 
+It show all fields/subfields that are in the MARC DB but NOT in any tab (= fields used but not visible) Usually, this means you made an error in your MARC editor. Sometimes, this is something normal.
+
+Enter $0 -c to run this script (the -c being here only to "confirm"
+EOF
+;#
+exit;
+}#/
+
+my $dbh = C4::Context->dbh;
+print "Checking\n";
+my $sth = $dbh->prepare("SELECT count(*), tag, subfieldcode, frameworkcode FROM marc_subfield_table, marc_biblio WHERE marc_biblio.bibid = marc_subfield_table.bibid group by frameworkcode,tag,subfieldcode");
+$sth->execute;
+my $sth2 = $dbh->prepare("select tab,liblibrarian,kohafield from marc_subfield_structure where tagfield=? and tagsubfield=? and frameworkcode=?");
+while (my ($total,$tag,$subfield,$frameworkcode) = $sth->fetchrow) {
+	$sth2->execute($tag,$subfield,$frameworkcode);
+	my ($tab,$liblibrarian,$kohafield) = $sth2->fetchrow;
+	if ($tab eq -1 && $kohafield ne "biblio.biblionumber" && $kohafield ne "biblioitems.biblioitemnumber" && $kohafield ne "items.itemnumber") {
+		print "Tab ignore for framework $frameworkcode, $tag\$$subfield - $liblibrarian (used $total times)\n";
+	}
+}
+
+print "Done\n";
diff --git a/misc/overduenotices.pl b/misc/overduenotices.pl
index ae0cf76149..d4be5cc84b 100644
--- a/misc/overduenotices.pl
+++ b/misc/overduenotices.pl
@@ -4,6 +4,7 @@
 # Script Version: 1.0
 # Date:  2003/9/7
 # Author:  Stephen Hedges (shedges@skemotah.com)
+# modified by Paul Poulain (paul@koha-fr.org)
 # Description: 
 #	This script runs a Koha report of items that
 #	are between 7 and 30 days overdue and generates
@@ -34,32 +35,46 @@
 # Suite 330, Boston, MA  02111-1307 USA
 
 use strict;
+use C4::Context;
+use C4::Date;
+use Mail::Sendmail;  # comment out if not doing e-mail notices
 
 print "This script will send overdue notices by e-mail and prepare a file of\nnotices for printing if the borrower does not have e-mail.\nYou MUST edit this script for your library BEFORE you run it for the first time!\nSee the comments in the script for directions on changing the script.\n\nDo you wish to continue? (y/n) ";
 chomp($_ = <STDIN>);
 die unless (/^y/i);  # comment these lines out once you've made the changes
 
+#
+# BEGINNING OF PARAMETERS
+#
+my $mindays = 7 # the notice will be sent after mindays days (grace period)
+my $maxdays = 30 # issues being more than maxdays late are managed somewhere else. (borrower probably suspended)
+my $smtpserver = 'smtp.yourserver.com'; # your smtp server (the server who sent mails)
+my $from = 'library@yourname.org';
+my $mailtitle = 'Overdue library items';
+my $librarymail = 'library@yourname.org'; # all notices without mail are sent (in 1 mail) to this mail address. They must then be managed manually.
+# this parameter (the last) is the text of the mail that is sent.
+# this text contains fields that are replaced by their value. Those fields must be written between brackets
+# The following fields are available :
+# <date> <itemcount> <firstname> <lastname> <address1> <address2> <address3> <city> <postcode>
+my $mailtext = "\n\n\nDear library borrower\n\n\n       <date>\n\n       According to our records, you have <itemcount> items that are at\n       least a week overdue for return to the library or renewal.\n       If you have registered a password with the library, you may use it\n       and your library card to login at http://XXX.org\n       to check the status of your account, or you may call any of our branch\n       Please be advised that all library services will be blocked\n       if items are allowed to go more than 30 days overdue.\n\n       Thank you for using your public libraries.\n\n\n                                             <firstname> <lastname>\n                                             <address1>\n                                             <address2>\n                                             <city>  <postcode>\n\n\n\n\n\n";
+#
+# END OF PARAMETERS
+#
 open OUTFILE, ">overdues" or die "Cannot open file overdues: $!";
 
-use C4::Context;
-use Mail::Sendmail;  # comment out if not doing e-mail notices
-
 # set the e-mail server -- comment out if not doing e-mail notices
-unshift @{$Mail::Sendmail::mailcfg{'smtp'}} , 'alma.athenscounty.lib.oh.us';
+unshift @{$Mail::Sendmail::mailcfg{'smtp'}} , $smtpserver;
 #                                         set your own mail server name here
 
 my $dbh = C4::Context->dbh;
-my $sth = $dbh->prepare ("SELECT issues.borrowernumber,firstname,surname,streetaddress,physstreet,city,zipcode,emailaddress FROM issues,borrowers WHERE returndate IS NULL AND TO_DAYS(NOW())-TO_DAYS(date_due) BETWEEN 7 and 30 AND issues.borrowernumber=borrowers.borrowernumber ORDER BY issues.borrowernumber");
-my $first_borrno = $dbh->prepare ("SELECT borrowernumber FROM issues WHERE returndate IS NULL AND TO_DAYS(NOW())-TO_DAYS(date_due) BETWEEN 7 and 30 ORDER BY borrowernumber");
+my $sth = $dbh->prepare ("SELECT issues.borrowernumber,firstname,surname,streetaddress,physstreet,city,zipcode,emailaddress FROM issues,borrowers,categorie WHERE returndate IS NULL AND TO_DAYS(NOW())-TO_DAYS(date_due) BETWEEN $mindays and $maxdays AND issues.borrowernumber=borrowers.borrowernumber and borrowers.categorycode=categories.categorycode and categories.overduenoticerequired=1 ORDER BY issues.borrowernumber");
+my $first_borrno = $dbh->prepare ("SELECT borrowernumber FROM issues WHERE returndate IS NULL AND TO_DAYS(NOW())-TO_DAYS(date_due) BETWEEN $mindays and $maxdays ORDER BY borrowernumber");
 my $get_date = $dbh->prepare ("SELECT CURDATE()");
 
 $get_date->execute;
 my $daydate = $get_date->fetchrow_arrayref;
 my $rawdate = $daydate->[0];
-my @dates = split /-/, $rawdate;              # split and reformat date
-my $date = "$dates[1]/$dates[2]/$dates[0]";
-$get_date->finish;
-
+my $date = format_date($rawdate);
 $first_borrno->execute;               # get first borrowernumber
 my $firstborr = $first_borrno->fetchrow_arrayref;
 my $borrowernumber = $firstborr->[0];
@@ -76,68 +91,87 @@ my ($firstname,$lastname,$address1,$address2,$city,$postcode,$email);
 while ($row = $sth->fetchrow_arrayref) {
     my $borrno = $row->[0];
     if ($itemcount==0) {    # store values for first borrower
-	$firstname = $row->[1];
-	$lastname = $row->[2];
-	$address1 = $row->[3];
-	$address2 = $row->[4];
-	unless ($address2) {
-	    $address2 = '';
-	}
-	$city = $row->[5];
-	unless ($city) {
-	    $city = '';
-	}
-	$postcode = $row->[6];
-	unless ($postcode) {
-	    $postcode = '';
-	}
-	$email = $row->[7];
+		$firstname = $row->[1];
+		$lastname = $row->[2];
+		$address1 = $row->[3];
+		$address2 = $row->[4];
+		unless ($address2) {
+			$address2 = '';
+		}
+		$city = $row->[5];
+		unless ($city) {
+			$city = '';
+		}
+		$postcode = $row->[6];
+		unless ($postcode) {
+			$postcode = '';
+		}
+		$email = $row->[7];
     }
     if ($borrno == $borrowernumber) {     # next borrower yet?
-	$itemcount++;
-	next;
+		$itemcount++;
+		next;
     } else {
-	$borrowernumber = $borrno;
-	my $notice = "\n\n\n       Athens County Library Services\n       95 W. Washington Street\n       Nelsonville, OH  45674\n\n\n       $date\n\n       According to our records, you have $itemcount items that are at\n       least a week overdue for return to the library or renewal.\n       If you have registered a password with the library, you may use it\n       and your library card to login at http://koha.athenscounty.lib.oh.us\n       to check the status of your account, or you may call any of the\n       Athens County public libraries.  (Athens: 592-4272;\n       Nelsonville: 753-2118; The Plains: 797-4579; Albany: 698-3059;\n       Glouster: 767-3670; Coolville: 667-3354; and Chauncey: 797-2512)\n       Please be advised that all library services will be blocked\n       if items are allowed to go more than 30 days overdue.\n\n       Thank you for using your public libraries.\n\n\n                                             $firstname $lastname\n                                             $address1\n                                             $address2\n                                             $city  $postcode\n\n\n\n\n\n";
+		$borrowernumber = $borrno;
+		my $notice = $mailtext;
+		$notice =~ s/\<date\>/$date/g;
+		$notice =~ s/\<itemcount\>/$itemcount/g;
+		$notice =~ s/\<firstname\>/$firstname/g;
+		$notice =~ s/\<lastname\>/$lastname/g;
+		$notice =~ s/\<address1\>/$address1/g;
+		$notice =~ s/\<address2\>/$address2/g;
+		$notice =~ s/\<address3\>/$address3/g;
+		$notice =~ s/\<city\>/$city/g;
+		$notice =~ s/\<postcode\>/$postcode/g;
+	
+	# if not using e-mail notices, comment out the following lines
+		if ($email) {   # or you might check for borrowers.preferredcont 
+			my %mail = ( To      => $email,
+							From    => $from,
+							Subject => $mailtitle,
+							Message => $notice,
+				);
+			sendmail(%mail);
+			$e_count++
+		} else {
+		# if not using e-mail notices, comment out the above lines
+			print $notice;
+			print OUTFILE $notice;
+			$count++;
+		}    # and comment this one out, too, if not using e-mail
 
-# if not using e-mail notices, comment out the following lines
-	if ($email) {   # or you might check for borrowers.preferredcont 
-	    my %mail = ( To      => $email,
-                         From    => 'nelpl@athenscounty.lib.oh.us',
-                         Subject => 'Overdue library items',
-                         Message => $notice,
-			 );
-	    sendmail(%mail);
-	    $e_count++
-	} else {
-# if not using e-mail notices, comment out the above lines
-
-	    print $notice;
-	    print OUTFILE $notice;
-	    $count++;
-	}    # and comment this one out, too, if not using e-mail
-
-	$itemcount = 1;   #start the count for next notice
-	$firstname = $row->[1]; # and store the new values
-	$lastname = $row->[2];
-	$address1 = $row->[3];
-	$address2 = $row->[4];
-	unless ($address2) {
-	    $address2 = '';
-	}
-	$city = $row->[5];
-	unless ($city) {
-	    $city = '';
-	}
-	$postcode = $row->[6];
-	unless ($postcode) {
-	    $postcode = '';
+		$itemcount = 1;   #start the count for next notice
+		$firstname = $row->[1]; # and store the new values
+		$lastname = $row->[2];
+		$address1 = $row->[3];
+		$address2 = $row->[4];
+		unless ($address2) {
+			$address2 = '';
+		}
+		$city = $row->[5];
+		unless ($city) {
+			$city = '';
+		}
+		$postcode = $row->[6];
+		unless ($postcode) {
+			$postcode = '';
+		}
+		$email = $row->[7];
 	}
-	$email = $row->[7];
-    }
 }
 $sth->finish;
 close OUTFILE;
+# if some notices have to be printed & managed by the library, send them to library mail address.
+if ($count) {
+		open ODUES, "overdues" or die "Cannot open file overdues: $!";
+		my $notice = "$e_count overdue notices e-mailed\n";
+		my $notice .= "$count overdue notices in file for printing\n\n";
+
+		my $notice .= <ODUES>;
+	    my %mail = ( To      => $email,
+                         From    => $from,
+                         Subject => 'Koha overdues',
+                         Message => $notice,
+			 );
+	    sendmail(%mail);
 
-print "$e_count overdue notices e-mailed\n";
-print "$count overdue notices in file for printing\n\n";
diff --git a/misc/rebuildnonmarc.pl b/misc/rebuildnonmarc.pl
index 6568a68e3c..31f1ada242 100755
--- a/misc/rebuildnonmarc.pl
+++ b/misc/rebuildnonmarc.pl
@@ -95,6 +95,7 @@ sub localNEWmodbiblio {
 	# now, modify addi authors, subject, addititles.
 	my ($tagfield,$tagsubfield) = MARCfind_marc_from_kohafield($dbh,"additionalauthors.author",$frameworkcode);
 	my @addiauthfields = $record->field($tagfield);
+	$dbh->do("delete from bibliosubtitle where biblionumber=$oldbiblionumber");
 	foreach my $addiauthfield (@addiauthfields) {
 		my @addiauthsubfields = $addiauthfield->subfield($tagsubfield);
 		foreach my $subfieldcount (0..$#addiauthsubfields) {
diff --git a/misc/release notes/release_notes_221.txt b/misc/release notes/release_notes_221.txt
new file mode 100644
index 0000000000..06ceb19bab
--- /dev/null
+++ b/misc/release notes/release_notes_221.txt	
@@ -0,0 +1,286 @@
+RELEASE NOTES
+=============
+
+Koha is the 1st Open-Source Integrated Library System.
+Released at first in New zealand, in 2000 januaray, it is maintained by a team of volunteers from around the globe, the Koha system is a full catalogue, opac, circulation and acquisitions system.
+
+Koha 2.2 is more than 247 000 lines of code, developped by more than 30 differents developpers (excluding translators).
+
+With the 2.2 version, Koha is now a mature product, with a lot of nice features. It's used in more than 50 libraries, from all kinds (public, schools, search, religious...), of all size (from 1 to 8 branches, from 1000 to 300 000 items).
+
+========
+WARNINGS
+========
+* the librarian interface is tested only with mozilla/firefox. Should work (partially) with IE. OPAC should work fine with any navigator.
+* Any 2.1.x install must be uninstalled before installing 2.2.0 No update is provided for 2.1.0.
+
+=======
+DIFFS
+=======
+Diff 2.2.0 => 2.2.1
+*******************
+BUGFIXES
+
+***** Critical
+
+***** Minor
+* in serials module >> add subscription >> select biblio : The next / previous page were invalid.
+* in serials module >> add subscription >> select biblio : impossible to report the biblio when there is a quote in it (' was not escaped)
+* issn were not stored correctly in non-MARC DB on biblio modification
+
+IMPROVEMENTS
+***** Major
+* serial subscriptions : modifs to handdle correctly more than 1 subscription of the same biblio. Enter subscription detail in subscription notes (like "for branch XX" or "for 2nd floor"). The subscription details are all shown in OPAC.
+* serial subscriptions : you can now delete a subscription that is not yet active (= has only 1 issue in "waiting" state)
+**** Minor
+* adding publicationyear and series title in opac advanced search form
+* in biblio basket, adding the possibility to open a biblio (in the main window) by clicking on the title
+* circulation >> issue : showing borrowernumber code just after the borrower name.
+
+Diff 2.2RC5 => 2.2.0
+********************
+BUGFIXES
+
+***** Critical
+* rolling back lock_tables_privs = 'Y' during install stage (too many problems) The option is shown in bulkmacimport instead.
+* bugfix for the search on a MARC detail, when you clic on the magnifying glass (caused an internal server error)
+
+***** Minor
+* error in authority => biblio 'jumper' that make the jump fail (was a remaining ')
+* when modifying a biblio, on a repeated field with many subfields, the test to show empty subfields in X>1 was wrong : the missing subfields of the 1st field were repeated.
+Example :
+606 has $a$x$z
+1st is 606$a (so $x$z empty)
+2nd is 606$a$x
+The marc editor in the 2nd field showed before this fix :
+606 $a a_value
+   $x another_value
+   $x
+   $z
+(the 2nd $x being useless)
+* Authorities : Minor changes in summary "exploding" (the 3 digits AFTER the subfield were not on the right place).
+* partial support of the "linkage" MARC feature : if you enter a "link" on a MARC subfield, the magnifying glass won't search on the field, but on the linked field. I agree it's a partial support. Will be improved, but I need to investigate MARC21 & UNIMARC diffs on this topic.
+IMPROVEMENTS
+
+***** Major
+* New systempref parameter : opacstylesheet If this parameter is set to a stylesheet URL, this stylesheet will be used instead of the opactheme one. With this parameter, you can have your own stylesheet for OPAC, that will be used and kept when you update your version of Koha. The systempref must be a complete URL (http://www.koha.org/stylesheet/somestylesheet.css for example)
+* improvements in shelves management in OPAC (synch'ing with librarian interface) : the user can modify a bookshelf, add a book into a bookshelf from the biblio, create a bookshelf "on the fly", from the bookshelf popup.
+* new directory migration_tools in $KOHA/misc Will store various migration tools. bulkmarcimport has been moved here.
+
+**** Minor
+* minor change in MARCdetail : when a field is repeated, the field header is not repeated but replaced by a nice little empty space.
+
+Diff 2.2RC4 => 2.2RC5
+*********************
+
+BUGFIXES
+
+***** Critical
+* limiting the number of search term to 8. There was no limit before, but 8 words seems to be the upper limit mySQL can deal with (in less than a second. tested on a DB with 13 000 items) In 2.4, a new DB structure will highly speed things and this limit will be removed. FindDuplicate is activated again.
+* bugfixes in french translation (that made cataloguing in french impossible)
+* set lock_tables_privs = 'Y' during install stage. Note this requires a mysql version not too old.
+
+***** Minor
+* during update, if the user enter a different directory for backup than the default one, the updater does not obey and stores in default directory anyway !
+* minor (spelling) fix for adding an organization
+* member search (bug 851) : stripping out comma and apostrophe from search terms
+* various methods to split subjects (depending on OS, a <CR> / <CR><LF> problem)
+
+IMPROVEMENTS
+
+***** Major
+* circulation / issue : adding a button to cancel an issue when a confirmation is required (bug #858)
+* circulation / issue : adding a checkbox to confirm reserve cancel when a reserved book is issued by someone else (bug #858)
+* virtual shelves : adding feature to create a virtual shelf on the fly, when adding a biblio, and feature to modify a virtual shelf name/status
+* catalogue : adding a systempref to define default view in OPAC (either normal, MARC or ISBD). Created automatically during install or update. Check that you have a Koha >> parameters >> systempreferences >> BiblioDefaultView, Variable type : Choice, Variable options : normal|marc|isbd
+
+**** Minor
+* an improvement has been done in DB calls that needs a new index. It's automatically added in fresh installs, but for updates, run the following SQL command :
+ALTER TABLE `marc_subfield_structure` ADD INDEX ( `kohafield` ) 
+* adding a systempref to define default view in OPAC (either normal, MARC or ISBD). Created automatically during install or update. Check that you have a Koha >> parameters >> systempreferences >> BiblioDefaultView, Variable type : Choice, Variable options : normal|marc|isbd
+* the list of authorities types is now ordered by authtypetext. Thus you can use the "space trick" : if you add a space before an authtype text, it's shown first. Useful when you have an authority type that you use more often than others.
+* authoritiy list shown in authtypetext order (so authtypetext with a space appear first, hint used everywhere else for lists)
+* some minor html changes (like changing "images" numbers in "text" numbers for result list page numbers.
+
+Diff 2.2RC3 => 2.2RC4
+*********************
+BUGFIXES
+
+***** Critical
+1 CRITICAL bug in acquisition (another one...) : when MARC=ON, and an order line is created from an existing biblio (to buy another item), the MARC biblio is lost and replaced by the non marc one (that has a lot less informations...). To solve the problem, the biblio can no more be modified after the order has been placed. Less feature, but more reliable ! (not simple solution to solve this problem. Would imply to rewrite the MARC biblio from the non marc datas, and no API is provided for this yet)
+2 CRITICAL bugfix in Biblio.pm, removing &branches declaration (was due to an untested cvs rollback, opac-search.pl was crashing)
+3 CRITICAL bugfix in Biblio.pm when MARC=OFF. subjects were stored and immediatly deleted. And not stored correctly in MARC part of the biblio. (thanks to Waylon Robertson)
+
+***** Minor
+1 bugfix in updatedatabase (auth_header creation table). Don't affect previous install of 2.2, only upgrades 2.0 => 2.2
+2 reading rec : Fixing link to toggle between full and limited display
+3 bugfix for moremember.pl that no longer outputed item type for issues
+4 defaulting actual cost to estimated cost (was 0 by default)
+5 bugfix : in biblio search, - and other signs where not properly managed. Leroy-Beaulieu could not be found
+6 the popup of the 210c plugin closes when a collection is choosed
+7 bugfix : could not select a biblio in subscription creation if the book was not for loan
+8 minor fixes in spelling in subscription
+9 adding acquisition in default userflags. This flag can be set for librarians that have access to acquisition
+10 in subscription enddate calculation, bugfix when subscription based on number of issues (worked when based on subscription length)
+11 in subscription next issue date calculation, bugfix when subscription frequency is 1/quarter.
+12 datelastseen is updated when the book is returned
+13 moredetail.pl shows incorrect date, incorrectly formatted (bug #689)
+14 DuplicateFinder has been disabled : sometimes goes into a looonnnggg lasting loop.
+15 when a query returns only one result, adding it to basket did not work.
+16 deletion of a suggestion was buggy. Now fixed
+17 for installation of Koha under Windows there is a bug with subject splitting. Now fixed. (thanks to Waylon Robertson)
+
+IMPROVEMENTS
+***** Major
+1 a lot in book shelves
+2 Submitting with no barcode in issues should clear for next patron (bug #865)
+3 screen added to see late issues from a given bookseller
+4 Koha should now work under mod_perl (Release Manager don't use mod_perl. fixes comes from A. Tarallo, Argentina, that ensure Koha works fine with mod_perl with the patches applied)
+
+**** Minor
+1 show also item tags into marc list of fields (in librarian search interface)
+2 email sent basket : the sender can give it's name, in case the basket is sent to a friend, not to itself
+3 removing useless string in isbd view
+4 cataloguing, in isbnsearch, after searching a title/ISBN, the librarian can choose the framework (+ it's a cataloguing screen, not an acquisition one)
+5 serials : in issues management, the waited/late issues bloc is before the collection state bloc.
+6 serials : the intranet note has been removed, it's useless
+7 after an authority is added/modified, go to this fresh authority (instead of authority-home)
+8 search option in auth-top
+9 in OPAC, the itemcallnumber search is a "start by" search (was a contains)
+10 opac note is defaulted to '' (was 0, that means nothing)
+11 adding blank to relshiploop (altrelationship) loop (Bug ???)
+12 when deleting an itemtype, don't check issuingrules, but delete them too
+13 For MARC=OFF installation, Waylon submitted a script to rebuild MARC part of the catalogue. It's in misc/updatemarc_subjects.pl (thanks to Waylon Robertson)
+
+Diff 2.2RC2 => 2.2RC3
+*********************
+* CRITICAL bug in acquisition : biblio badly stored in MARC part of Koha, deleting another biblio...
+* CRITICAL problem : the duplicate finder (when adding a biblio) has performances problems under certains circumstances.
+* bug #862 fixed : Upgrade does not work (from 2.2RC1 to 2.2RC2)
+* bugfix in acquisition, when a line is modified, aqorderbreakdown was duplicated. (Seems it was a mysql return value depending on mysql version)
+* bugfix in setting user permissions (they were stored, but not shown correctly after)
+* bugfix in translation error for basket sent in OPAC
+* bugfix in 225a plugin (editor chooser)
+* adding itemcallnumber entry in systempreferences during install
+* error in biblio detail showing when MARC=ON (bug from RC2, did not exist before)
+* bug in acceptorreject OPAC suggestion (bug from RC2, did not exist before)
+* Not really a bug but : stopword must not be empty. If it's empty, the search fail.
+* During install, the user can load french and english stopwords if he want.
+* French librarian interface seems OK
+* addbook (1st page when MARC=ON) is a catalogue screen, not an acquisition one
+* The barcode is shown in the list of books issued by a borrower in opac-user page.
+
+Diff 2.2RC1 => 2.2RC2
+*********************
+* bugfix for import in reservoir : title and isbn where not extracted.
+* bugfix in OPAC : it was possible to reserve books that where "notforloan"
+* bugfix in circulation : no warning when a reserve was made on a book that you try to issue to someone else. 
+* bugfix & improvement for catalogue management behaviour when MARC=OFF
+* bugfix in bookshelves (in CVS, probably not in official tar.gz)
+* bugfix in online help (in CVS, probably not in official tar.gz)
+
+=============
+INSTALLATION
+=============
+* Download the package
+* tar xvfz koha-version.tar.gz
+* cd koha-version
+* ./installer.pl
+* READ and FOLLOW the instructions
+
+READING what is on screen during installation is VERY important. Some decisions you make during install stage are very hard to reproduce after.
+
+
+UPGRADE from previous 2.0.0preX or RCx version
+*******
+* Download the package
+* tar xvfz koha-version.tar.gz
+* cd koha-version
+* ./koha.upgrade
+* Follow the instructions
+
+UPGRADE from previous 1.2.x version :
+********
+UPGRADE TO A 2.0.0 version before upgrading
+
+UPGRADE from a 2.1.x version is NOT AVAILABLE. Don't install 2.2 on a 2.1.x test database. A lot of DB changes have been done since 2.1.x & cannot be handled by the DB updater.
+
+=============
+NEW FEATURES
+=============
+Koha 2.2 has, of course, all the previous features from Koha (acquisition, cataloguing, circulation, members modules, OPAC, complete MARC support...) plus the following new ones :
+
+General :
+*********
+* (almost) complete rewrite of librarian GUI : now Koha uses CSS, and is easier to use. However, users of Koha 2.0.0 won't be lost, as the general organisation of the product has not changed.
+* Online Help : an online help is available everywhere in the librarian interface. It's complete in the parameters section of Koha and for new features. It will be completed for the rest of the product.
+* Better LDAP suport : Koha 2.2 can be "connected" to a LDAP server and get all borrower informations from there (including borrower category where applicable). However, to avoid problems for libraries without LDAP server, the LDAP features have been stored in modules/C4/Auth_with_ldap.pm file. The standard Auth.pm don't use it. If you want LDAP, just perldoc Auth_with_ldap.pm and manually tune your Auth package !
+* Auto installer : if you install koha with ./install -i /path/to/auto_install_file, then Koha will be installed almost without question. A very usefull feature for developpers that want to install/uninstall Koha quite often. A sample of auto_install_file is provided in misc/auto_install_file.
+* Uninstaller : run misc/uninstall.pl, provide the mysql root password. that's all. Koha is completely deleted and can be reinstalled. With the previous feature, it's a very nice solution for test platform.
+* mod_perl : Koha should now work under mod_perl, that gives a big performance boost (Release Manager don't use mod_perl. fixes comes from A. Tarallo, Argentina, that ensure Koha works fine with mod_perl with the patches applied)
+* Nelsonville have shared their templates. They are available as NPL theme.
+* Language : in this version, only english and french versions are fully functionnal. Spanish and chinese are provided, but not fully functionnal. Polish, German, Arabic, Hebrew, and many other languages have volunteers and should be here in a future 2.2.x
+
+
+BE CAREFUL with uninstaller : 
+1- This script does not ask for confirmation after mysql root password.
+2- This script uses /etc/koha.conf. If you have more than 1 koha on your server, use /etc/koha.conf for a "deletable-test" one.
+
+Acquisition :
+*************
+* suggestion : borrowers can suggest items to buy in OPAC. Then, the librarian can manage (accept or refuse) and order them.
+* possibility to close a basket, he can't be modified then
+* order a basket by publisher or by bookfund/publisher
+* search order history
+
+Cataloguing :
+*************
+* Cataloguing frameworks : you can define as many frameworks as you want. A framework describes how a material is catalogued (which fields, subfields, which constraints on them...)
+* MARC authorities : Koha now supports authorities in MARC. You can define the MARC structure for authorities like for biblios.
+* New contraints can be set for subfields :
+  - subfield is hidden : appears in MARC editor, but not in OPAC.
+  - subfield is an URL : the field can be cliqued
+  - related fields : a search made on a subfield also uses other subfields automatically. Using this feature, a search on "title" can search title, but also subtitle, uniform title,...
+* Item location can now be done on 3 levels : the branch, the location (room), the callnumber.
+* The callnumber can now be calculated from the LC, the dewey, or be freely (and manually) entered.
+* Duplicate finder : this powerful feature help your cataloguers avoiding duplicate biblios.
+* ISBD view : in librarian interface as well as in OPAC biblios can be shown in standard (default) presentation, in MARC (human readable) or ISBD. The ISBD view can be tuned by the librarian team. There is also a systempref to define default view in OPAC (either normal, MARC or ISBD). Created automatically during install or update. Check that you have a Koha >> parameters >> systempreferences >> BiblioDefaultView, Variable type : Choice, Variable options : normal|marc|isbd
+* UNIMARC plugin for every 1xx fields : ESNMP have developped all the plugins for UNIMARC fields 1xx. Those fields are coded fields.
+
+Serial cataloguing :
+********************
+Koha 2.2 manage serial subscriptions and issuing of those subscriptions. (Only a few words to describe a very important & complete module !)
+
+Catalogue search :
+******************
+* Search in OPAC and librarian interface has been improved. They now are exactly the same.
+* Spelling suggestion : before sending a request, the user can ask for spelling suggestion. This shows other forms of words entered that would give results. Give poor results for instance, the Koha team is thinking to a true spellchecking.
+* The user can select the order of the results and the number of results shown.
+
+Members :
+*********
+* The borrowernote field is shown on issue and transfer.
+* The textmessaging field appears in OPAC when the user logs in.
+
+Circulation :
+*************
+* New issuing rules : Issuing can be set for branch / borrower type / item category, by number of days and number of items available.
+* "joker" issuing rules : the library can set issuing rules for "any branch" or "any borrower type", or "any item category".
+Both issuing rules are cumulative : a library can set issuing rules to 10 books, 5 CD, but 12 total (books or CD).
+
+OPAC :
+******
+In Koha 2.2, koha has :
+* baskets. A basket can be printed or sent by mail to the borrower
+* virtual shelves : a virtual shelf can be created and filled by any logged borrower. A given virtual shelf can be private or public. Or even free-for-all.
+* language chooser : the borrower can change the language on the fly. The default language being still choosen by the library
+* complete CSS definition. With a new systempref parameter : opacstylesheet. If this parameter is set to a stylesheet URL, this stylesheet will be used instead of the opactheme one. With this parameter, you can have your own stylesheet for OPAC, that will be used and kept when you update your version of Koha. The systempref must be a complete URL (http://www.koha.org/stylesheet/somestylesheet.css for example)
+
+Barcode printing :
+******************
+A new module has been added to the parameters section : barcode printing. It requires the PDF::Api2 Perl package and can print barcode on 
+
+============
+Koha Future
+============
+The future of Koha is being discussed on mailing lists and on koha wiki : http://www.saas.nsw.edu.au/koha_wiki/index.php?page=KohaRoadmap2.2.x
diff --git a/misc/translator/Makefile b/misc/translator/Makefile
index 9706c705f0..d97a666bee 100644
--- a/misc/translator/Makefile
+++ b/misc/translator/Makefile
@@ -1,4 +1,7 @@
 all: translator_doc.txt
 
 %.txt: %.html
-	LANG=C w3m $< > $@
+	set -x; sed -e 's/<blockquote>/&<table border=0 width="100%"><tr><td nowrap><pre>/g' -e 's/<\/blockquote>/<\/pre><\/table>&/g' $<|LANG=C w3m -T text/html -cols 80 | sed -e 's/  *$$//g' | cat -s > $@
+
+clean:
+	rm translator_doc.txt
diff --git a/misc/translator/po/css_opac_fr_FR.po b/misc/translator/po/css_opac_fr_FR.po
index c58048a2dd..d933d84b16 100644
--- a/misc/translator/po/css_opac_fr_FR.po
+++ b/misc/translator/po/css_opac_fr_FR.po
@@ -1,1970 +1,2151 @@
-# Penbwrdd yn Gymraeg.
-# Copyright (C) 2003 Free Software Foundation, Inc.
-# www.kyfieithu.co.uk<kyfieithu@dotmon.com>, www.gyfieithu.co.uk<kyfieithu@dotmon.com>, 2003.
+# Koha OPAC module, French translation
+# Copyright (C) 2000-2005 Katipo Communications
+# This file is distributed under the same license as the Koha package.
+# Copyright 2004-2005 French translation team
 #
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2004-12-07 11:28+0200\n"
-"Last-Translator: www.kyfieithu.co.uk <kyfieithu@dotmon.com>, www.gyfieithu.co.uk<kyfieithu@dotmon.com>\n"
+"POT-Creation-Date: 2005-02-11 15:59+0100\n"
+"PO-Revision-Date: 2005-01-19 11:05+0200\n"
+"Last-Translator: www.kyfieithu.co.uk <kyfieithu@dotmon.com>, www.gyfieithu."
+"co.uk<kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
-"X-Generator: Kartouche 0.2 - 28 October 2003\n"
 "\n"
 
 # 
-#. SCRIPT 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:24 
 #
-msgid "Biblio(s) added"
+#
+#. SCRIPT
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
+msgid " Biblio(s) added"
 msgstr "Notice(s) ajoutée(s)"
 
-#. %1$s: TMPL_VAR name=firstname 
-#. %2$s: TMPL_VAR name=surname 
-#. %3$s: TMPL_VAR name=title 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:7 
+#. %1$S: type=text name=value
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:112
 #, c-format
-msgid "%s %s (%s)"
-msgstr "%s %s (%s)"
+msgid "%S and"
+msgstr "%S et"
 
-#. %1$s: TMPL_VAR name=shelfname 
-#. %2$s: TMPL_VAR name=shelfbookcount 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:90 
+#. %1$s: TMPL_VAR name=firstname
+#. %2$s: TMPL_VAR name=surname
+#. %3$s: TMPL_VAR name=title
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:7
 #, c-format
-msgid "%s (%s books)"
-msgstr "%s (%s documents)"
+msgid "%s %s (%s)"
+msgstr "%s %s (%s)"
 
-#. %1$s: TMPL_VAR name=title 
-#. %2$s: TMPL_VAR name=author 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:9 
+#. %1$s: TMPL_VAR name=title
+#. %2$s: TMPL_VAR name=author
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:9
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#. %1$s: TMPL_VAR name=phone 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:9 
+#. %1$s: TMPL_VAR name=phone
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:9
 #, c-format
 msgid "%s (hm)"
 msgstr "%s(domicile)"
 
-#. For the first occurrence, 
-#. %1$s: TMPL_VAR name=title 
-#. %2$s: TMPL_VAR name=biblionumber 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:37 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:23 
-#, c-format
-msgid "%s (record %s)"
-msgstr "%s (enregistrement %s)"
-
-#. %1$s: TMPL_VAR name=faxnumber 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:10 
+#. %1$s: TMPL_VAR name=faxnumber
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:10
 #, c-format
 msgid "%s (wk)"
 msgstr "%s (travail)"
 
-#. %1$s: TMPL_VAR name=biblioitemnumber 
-#. %2$s: TMPL_VAR name=description 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:17 
+#. %1$s: TMPL_VAR name=subtitle
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:51
+#, c-format
+msgid "%s ;"
+msgstr "%s ;"
+
+#. %1$s: TMPL_VAR name=biblioitemnumber
+#. %2$s: TMPL_VAR name=description
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:17
 #, c-format
 msgid "%s GROUP - %s"
 msgstr "%s GROUPE - %s"
 
-#. %1$s: TMPL_VAR name=itemtype 
-#. %2$s: TMPL_VAR name=duration 
-#. %3$s: TMPL_VAR name=total 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:7 
+#. %1$s: TMPL_VAR name=itemtype
+#. %2$s: TMPL_VAR name=duration
+#. %3$s: TMPL_VAR name=total
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:7
 #, c-format
 msgid "%s acquired in the last <i>%s</i> days. %s results found"
 msgstr "%s acquis dans les <i>%s</i> derniers jours. %s réponses"
 
-#. %1$s: TMPL_VAR name=CGIitemtype 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:41 
+#. %1$s: TMPL_VAR name=CGIitemtype
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:41
 #, c-format
 msgid "%s acquired recently (the most recent being first)"
 msgstr "%s acquis récemment (les plus récents en premier)"
 
-#. %1$s: TMPL_VAR name=numberlength 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:70 
+#. %1$s: TMPL_VAR name=numberlength
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:71
 #, c-format
 msgid "%s issues"
 msgstr "%s prêts"
 
-#. %1$s: TMPL_VAR name=monthlength 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:72 
+#. %1$s: TMPL_VAR name=shelfbookcount
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:132
+#, c-format
+msgid "%s item(s)"
+msgstr "%s documents(s)"
+
+#. %1$s: TMPL_VAR name=monthlength
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:73
 #, c-format
 msgid "%s months"
 msgstr "%s mois"
 
-#. %1$s: TMPL_VAR name=weeklength 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:71 
+#. %1$s: TMPL_VAR name=weeklength
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:72
 #, c-format
 msgid "%s weeks"
 msgstr "%s mois"
 
-#. %1$s: TMPL_VAR name=shelfname 
-#. %2$s: TMPL_VAR name=shelfbookcount 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:148 
-#, c-format
-msgid "%s(%s books)"
-msgstr "%s(%s documents)"
-
-#. %1$s: TMPL_VAR name=author 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:3 
+#. %1$s: TMPL_VAR name=author
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:3
 #, c-format
 msgid "%s,"
 msgstr "%s,"
 
-#. For the first occurrence, 
-#. %1$s: TMPL_VAR name=streetaddress 
-#. %2$s: TMPL_VAR name=city 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:8 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detailprint.tmpl:39 
+#. For the first occurrence,
+#. %1$s: TMPL_VAR name=streetaddress
+#. %2$s: TMPL_VAR name=city
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:8
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detailprint.tmpl:39
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#. %1$s: TMPL_VAR name=btitle 
-#. %2$s: TMPL_VAR name=branch 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:42 
+#. %1$s: TMPL_VAR name=btitle
+#. %2$s: TMPL_VAR name=branch
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:42
 #, c-format
 msgid "%s, pick up at: <b>%s</b>"
 msgstr "%s, à récupérer à <b>%s</b>"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:29
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:29
 msgid "&copy;"
 msgstr "©"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:94
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:105
 msgid "&lt;&lt;&lt;Previous"
 msgstr "<<<Précédent"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:17 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:117
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:17
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:127
 msgid "&lt;&lt;Previous"
 msgstr "Précédent"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:34
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:34
 msgid "&nbsp; No results found."
 msgstr "Pas de résultats"
 
-#. For the first occurrence, 
-#. %1$s: TMPL_VAR name=itemcallnumber 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:76 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:109 
+#. For the first occurrence,
+#. %1$s: TMPL_VAR name=itemcallnumber
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:86
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:127
 #, c-format
 msgid "(%s)"
 msgstr "(%s)"
 
-#. %1$s: TMPL_VAR name=date_due 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:73 
+#. %1$s: TMPL_VAR name=date_due
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:83
 #, c-format
 msgid "(On Loan until %s)"
 msgstr "(prété jusqu'au %s)"
 
-#. %1$s: TMPL_VAR name=timestamp 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:63 
+#. %1$s: TMPL_VAR name=timestamp
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:73
 #, c-format
 msgid "(modified on %s)"
 msgstr "(modifié le %s)"
 
-#. For the first occurrence, 
-#. %1$s: TMPL_VAR name=publicationyear 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:57 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:58 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:60 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:72 
+#. For the first occurrence,
+#. %1$s: TMPL_VAR name=publicationyear
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:67
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:68
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:70
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:90
 #, c-format
 msgid "- %s"
 msgstr "- %s"
 
-#. %1$s: TMPL_VAR name=marcsubjct 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:84 
+#. %1$s: TMPL_VAR name=marcsubjct
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:102
 #, c-format
 msgid "- <a1> %s </a>"
 msgstr "- <a1> %s </a>"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:27
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:28
 msgid "2 months"
 msgstr "2 mois"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:36
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:37
 msgid "2 quarters"
 msgstr "2 trimestres"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:18
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:19
 msgid "2 weeks"
 msgstr "2 semaines"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:42
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:43
 msgid "2 years"
 msgstr "2 ans"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:30
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:31
 msgid "3 months"
 msgstr "3 mois"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:21
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:22
 msgid "3 weeks"
 msgstr "3 semaines"
 
-#. %1$s: TMPL_VAR name=notes 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:61 
+#. %1$s: TMPL_VAR name=notes
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:71
 #, c-format
 msgid ": %s"
 msgstr ": %s"
 
-#. For the first occurrence, 
-#. %1$s: TMPL_VAR name=place 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:59 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:62 
+#. For the first occurrence,
+#. %1$s: TMPL_VAR name=place
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:69
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:72
 #, c-format
 msgid "; %s"
 msgstr "; %s"
 
-#. %1$s: TMPL_VAR name=loggedinusername 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:60 
+#. %1$s: TMPL_VAR name=loggedinusername
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:60
 #, c-format
 msgid "<a1> %s home </a> <a2> Log Out </a>"
 msgstr "<a1> %s accueil </a> <a2> Déconnexion </a>"
 
-#. %1$s: TMPL_VAR name=dateaccessioned 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:77 
+#. %1$s: TMPL_VAR name=dateaccessioned
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:77
 #, c-format
 msgid "<a1> Accession</a> Date:%s"
 msgstr "<a1>vu le</a>:%s"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:5 
-#, c-format
-msgid "<a1> ISBD </a> <a2> MARC </a> <a3> Print </a>"
-msgstr "<a1> ISBD </a> <a2> MARC </a> <a3> Imprimer </a>"
-
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-MARCdetail.tmpl:4 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-MARCdetail.tmpl:3
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:5
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-ISBDdetail.tmpl:4
 #, c-format
-msgid "<a1> Normal </a> <a2> ISBD </a> <a3> Print </a>"
-msgstr "<a1> Normal </a> <a2> ISBD </a> <a3> Imprimer </a>"
+msgid ""
+"<a1> Simple </a> <a2> Complete </a> <a3> ISBD </a> <a4> Add to shelf </a> "
+"<a5> Print </a>"
+msgstr ""
+"<a1> Simple </a> <a2> Complète </a> <a3> ISBD </a> <a4> Ajouter dans "
+"l'étagère </a> <a5> Imprimer </a>"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-ISBDdetail.tmpl:4 
+#. %1$s: TMPL_VAR name=shelfname
+#. %2$s: TMPL_VAR name=shelfbookcount
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:70
 #, c-format
-msgid "<a1> Normal </a> <a2> MARC </a> <a3> Print </a>"
-msgstr "<a1> Normal </a> <a2> MARC </a> <a3> Imprimer </a>"
+msgid "<a1>%s</a> (%s item(s))"
+msgstr "<a1>%s</a> (%s document(s))"
 
-#. %1$s: TMPL_VAR name=subject 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:53 
+#. %1$s: TMPL_VAR name=subject
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:65
 #, c-format
 msgid "<a1>%s</a>,"
 msgstr "<a1>%s</a>,"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-bottom.inc:9 
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-bottom.inc:9
 #, c-format
 msgid "<a1>Log In</a> to Koha"
 msgstr "<a1>Se connecter</a> à  Koha"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:72 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:72
 #, c-format
 msgid "<a1>Log in to Koha</a> to have personal options."
 msgstr "<a1>S'identifier</a> pour accéder à votre dossier personnel"
 
-#. %1$s: TMPL_VAR name=issues 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:81 
+#. %1$s: TMPL_VAR name=surname
+#. %2$s: TMPL_VAR name=firstname
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:136
+#, c-format
+msgid "<a1>Modify</a> %s%s"
+msgstr "<a1>Modifier</a> %s%s"
+
+#. %1$s: TMPL_VAR name=issues
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:81
 #, c-format
 msgid "<b><a1>Total Issues:</a></b> %s"
 msgstr "<b>Total des prêts:</b> %s"
 
-#. %1$s: TMPL_VAR name=additional 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:44 
+#. %1$s: TMPL_VAR name=additional
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:56
 #, c-format
 msgid "<b>Additional Author:</b>%s"
 msgstr "<b>Auteur secondaire :</b>%s"
 
-#. %1$s: TMPL_VAR name=additional 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:31 
+#. %1$s: TMPL_VAR name=additional
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:138
 #, c-format
 msgid "<b>Additional authors:</b>%s"
-msgstr "<b>Auteurs secondaires:</b>%s  	    	
- 	"
+msgstr "<b>Auteurs secondaires:</b>%s"
 
-#. For the first occurrence, 
-#. %1$s: TMPL_VAR name=author 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:43 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:30 
+#. For the first occurrence,
+#. %1$s: TMPL_VAR name=author
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:55
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:137
 #, c-format
 msgid "<b>Author:</b> %s"
 msgstr "<b>Auteur :</b> %s"
 
-#. %1$s: TMPL_VAR name=biblionumber 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:85 
+#. %1$s: TMPL_VAR name=biblionumber
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:85
 #, c-format
 msgid "<b>Biblio number:</b> %s"
 msgstr "<b>Numéro de notice :</b> %s"
 
-#. %1$s: TMPL_VAR name=biblionumber 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:26 
+#. %1$s: TMPL_VAR name=biblionumber
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:26
 #, c-format
 msgid "<b>Biblionumber:</b> %s"
 msgstr "<b>Numéro de notice :</b> %s"
 
-#. For the first occurrence, 
-#. %1$s: TMPL_VAR name=classification 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:43 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detailprint.tmpl:25 
+#. For the first occurrence,
+#. %1$s: TMPL_VAR name=classification
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:150
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detailprint.tmpl:25
 #, c-format
 msgid "<b>Classification:</b> %s"
 msgstr "<b>Cote:</b>%s"
 
-#. %1$s: TMPL_VAR name=classification 
-#. %2$s: TMPL_VAR name=dewey 
-#. %3$s: TMPL_VAR name=subclass 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:31 
+#. %1$s: TMPL_VAR name=classification
+#. %2$s: TMPL_VAR name=dewey
+#. %3$s: TMPL_VAR name=subclass
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:31
 #, c-format
 msgid "<b>Classification:</b> %s%s%s"
 msgstr "<b>Cote:</b>%s%s%s"
 
-#. For the first occurrence, 
-#. %1$s: TMPL_VAR name=seriestitle 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:36 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detailprint.tmpl:19 
+#. For the first occurrence,
+#. %1$s: TMPL_VAR name=seriestitle
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:62
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:143
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detailprint.tmpl:19
 #, c-format
 msgid "<b>Collection:</b> %s"
 msgstr "<b>Collection:</b> %s"
 
-#. %1$s: TMPL_VAR name=copyrightdate 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:38 
+#. %1$s: TMPL_VAR name=copyrightdate
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:145
 #, c-format
 msgid "<b>Copyright year:</b> %s"
 msgstr "<b>Tous droits réservés année:</b>%s"
 
-#. %1$s: TMPL_VAR name=holdingbranch 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:71 
+#. %1$s: TMPL_VAR name=holdingbranch
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:71
 #, c-format
 msgid "<b>Current Branch:</b> %s"
 msgstr "<b>Site actuel :</b> %s"
 
-#. %1$s: TMPL_VAR name=publicationyear 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:35 
+#. %1$s: TMPL_VAR name=publicationyear
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:35
 #, c-format
 msgid "<b>Date:</b> %s"
 msgstr "<b>Date de publication :</b> %s"
 
-#. %1$s: TMPL_VAR name=dewey 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detailprint.tmpl:24 
+#. %1$s: TMPL_VAR name=dewey
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detailprint.tmpl:24
 #, c-format
 msgid "<b>Dewey:</b> <a1>%s</a>"
 msgstr "<b>Dewey:</b> <a1>%s</a>"
 
-#. %1$s: TMPL_VAR name=dewey 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:42 
+#. For the first occurrence,
+#. %1$s: TMPL_VAR name=dewey
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:70
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:149
 #, c-format
 msgid "<b>Dewey:</b>%s"
 msgstr "<b>Dewey:</b>%s"
 
-#. %1$s: TMPL_VAR name=biblioitemnumber 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:84 
+#. %1$s: TMPL_VAR name=biblioitemnumber
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:84
 #, c-format
 msgid "<b>Group Number:</b> %s"
 msgstr "<b>Nombre Total de documents %s"
 
-#. %1$s: TMPL_VAR name=homebranch 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:65 
+#. %1$s: TMPL_VAR name=homebranch
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:65
 #, c-format
 msgid "<b>Home Branch:</b> %s"
 msgstr "</b> %s'><b>Site d'origine:</b> %s"
 
-#. %1$s: TMPL_VAR name=isbn 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:32 
+#. For the first occurrence,
+#. %1$s: TMPL_VAR name=isbn
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:61
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:32
 #, c-format
 msgid "<b>ISBN:</b> %s"
 msgstr "<b>ISBN:</b>%s"
 
-#. For the first occurrence, 
-#. %1$s: TMPL_VAR name=ISBN 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:28 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detailprint.tmpl:28 
+#. For the first occurrence,
+#. %1$s: TMPL_VAR name=ISBN
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:135
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detailprint.tmpl:28
 #, c-format
 msgid "<b>ISBN:</b>%s"
 msgstr "<b>ISBN:</b>%s"
 
-#. %1$s: TMPL_VAR name=illus 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:38 
+#. %1$s: TMPL_VAR name=illus
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:38
 #, c-format
 msgid "<b>Illus:</b> %s"
 msgstr "<b>Illus:</b> %s"
 
-#. %1$s: TMPL_VAR name=itemtype 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:27 
+#. %1$s: TMPL_VAR name=itemtype
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:27
 #, c-format
 msgid "<b>Item Type:</b> %s"
 msgstr "<b>Type de document : </b>%s"
 
-#. %1$s: TMPL_VAR name=itemlost 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:73 
+#. %1$s: TMPL_VAR name=itemlost
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:73
 #, c-format
 msgid "<b>Item lost:</b> %s"
 msgstr "<b> Document perdu :</b> %s"
 
-#. %1$s: TMPL_VAR name=itemtype 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:60 
-#, c-format
-msgid "<b>Item type : </b>%s"
-msgstr "<b>Type de document : </b>%s"
-
-#. For the first occurrence, 
-#. %1$s: TMPL_VAR name=lccn 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:44 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detailprint.tmpl:26 
+#. For the first occurrence,
+#. %1$s: TMPL_VAR name=lccn
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:151
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detailprint.tmpl:26
 #, c-format
 msgid "<b>LCCN:</b> %s"
 msgstr "<b>LCCN:</b> %s"
 
-#. %1$s: TMPL_VAR name=card0 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:69 
+#. %1$s: TMPL_VAR name=card0
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:69
 #, c-format
 msgid "<b>Last Borrower 1:</b> %s"
-msgstr "<b>Dernier emprunteur 1:</b> %s "
+msgstr "<b>Dernier emprunteur 1:</b> %s"
 
-#. %1$s: TMPL_VAR name=card1 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:70 
+#. %1$s: TMPL_VAR name=card1
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:70
 #, c-format
 msgid "<b>Last Borrower 2:</b> %s"
-msgstr "<b>Dernier emprunteur 2:</b> %s "
+msgstr "<b>Dernier emprunteur 2:</b> %s"
 
-#. %1$s: TMPL_VAR name=timestamp0 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:67 
+#. %1$s: TMPL_VAR name=timestamp0
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:67
 #, c-format
 msgid "<b>Last borrowed:</b> %s"
-msgstr "<b>Dernier emprunteur :</b> %s "
+msgstr "<b>Dernier emprunteur :</b> %s"
 
-#. %1$s: TMPL_VAR name=datelastseen 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:66 
+#. %1$s: TMPL_VAR name=datelastseen
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:66
 #, c-format
 msgid "<b>Last seen:</b> %s"
 msgstr "<b>Vu le :</b> %s"
 
-#. %1$s: TMPL_VAR name=loanlength 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:29 
+#. %1$s: TMPL_VAR name=loanlength
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:29
 #, c-format
 msgid "<b>Loan Length:</b> %s"
 msgstr "<b>Durée du prêt:</b> %s"
 
-#. %1$s: TMPL_VAR name=count 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:41 
+#. %1$s: TMPL_VAR name=count
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:41
 #, c-format
 msgid "<b>No. of Items:</b> %s"
 msgstr "</b> %s'><b>Nbre. d'exemplaires:</b> %s"
 
-#. For the first occurrence, 
-#. %1$s: TMPL_VAR name=bnotes 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:40 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:75 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:39 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detailprint.tmpl:22 
+#. For the first occurrence,
+#. %1$s: TMPL_VAR name=notes
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:68
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:40
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:75
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:146
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detailprint.tmpl:22
 #, c-format
 msgid "<b>Notes:</b> %s"
 msgstr "<b>Remarques:</b> %s"
 
-#. %1$s: TMPL_VAR name=pages 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:37 
+#. %1$s: TMPL_VAR name=pages
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:37
 #, c-format
 msgid "<b>Pages:</b> %s"
 msgstr "<b>Pages:</b> %s"
 
-#. %1$s: TMPL_VAR name=paidfor 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:74 
+#. %1$s: TMPL_VAR name=paidfor
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:74
 #, c-format
 msgid "<b>Paid for:</b> %s"
 msgstr "<b>Payé pour:</b> %s"
 
-#. %1$s: TMPL_VAR name=place 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:34 
+#. %1$s: TMPL_VAR name=place
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:34
 #, c-format
 msgid "<b>Place:</b> %s"
 msgstr "<b>Emplacement:</b> %s"
 
-#. %1$s: TMPL_VAR name=publishercode 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detailprint.tmpl:15 
+#. %1$s: TMPL_VAR name=publishercode
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detailprint.tmpl:15
 #, c-format
 msgid "<b>Published by :</b>%s"
 msgstr "<b>publié par :</b>%s"
 
-#. %1$s: TMPL_VAR name=publishercode 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:33 
+#. %1$s: TMPL_VAR name=publishercode
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:33
 #, c-format
 msgid "<b>Publisher:</b> %s"
 msgstr "<b>Editeur:</b> %s"
 
-#. %1$s: TMPL_VAR name=renewals 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:76 
+#. %1$s: TMPL_VAR name=renewals
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:76
 #, c-format
 msgid "<b>Renewals:</b> %s"
 msgstr "<b>Renouvellements:</b> %s"
 
-#. %1$s: TMPL_VAR name=rentalcharge 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:30 
+#. %1$s: TMPL_VAR name=rentalcharge
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:30
 #, c-format
 msgid "<b>Rental Charge:</b> %s"
 msgstr "<b>Frais de location:</b> %s"
 
-#. %1$s: TMPL_VAR name=replacementprice 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:72 
+#. %1$s: TMPL_VAR name=replacementprice
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:72
 #, c-format
 msgid "<b>Replacement Price:</b> %s"
 msgstr "<b>Prix de Remplacement :</b> %s"
 
-#. %1$s: TMPL_VAR name=serial 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:41 
+#. %1$s: TMPL_VAR name=serial
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:148
 #, c-format
 msgid "<b>Serial:</b>%s"
 msgstr "<b>Colection:</b>%s"
 
-#. %1$s: TMPL_VAR name=size 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:39 
+#. %1$s: TMPL_VAR name=size
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:39
 #, c-format
 msgid "<b>Size:</b> %s"
 msgstr "<b>Taille :</b> %s"
 
-#. For the first occurrence, 
-#. %1$s: TMPL_VAR name=subject 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:37 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detailprint.tmpl:20 
+#. For the first occurrence,
+#. %1$s: TMPL_VAR name=subject
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:144
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detailprint.tmpl:20
 #, c-format
 msgid "<b>Subject:</b> %s"
 msgstr "<b>Mot-clef :</b> %s"
 
-#. %1$s: TMPL_VAR name=count 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:61 
+#. %1$s: TMPL_VAR name=count
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:79
 #, c-format
 msgid "<b>Total Number of Items:</b> %s"
 msgstr "<b>Nombre Total de documents %s"
 
-#. For the first occurrence, 
-#. %1$s: TMPL_VAR name=url 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:28 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:45 
+#. For the first occurrence,
+#. %1$s: TMPL_VAR name=url
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:28
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:152
 #, c-format
 msgid "<b>URL:</b> %s"
 msgstr "<b>URL:</b> %s"
 
-#. For the first occurrence, 
-#. %1$s: TMPL_VAR name=url 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:59 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detailprint.tmpl:27 
+#. For the first occurrence,
+#. %1$s: TMPL_VAR name=url
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:71
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detailprint.tmpl:27
 #, c-format
 msgid "<b>URL:</b> <a1>%s</a>"
 msgstr "<b>URL:</b> <a1>%s</a>"
 
-#. %1$s: TMPL_VAR name=unititle 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:40 
+#. %1$s: TMPL_VAR name=unititle
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:147
 #, c-format
 msgid "<b>Uniform title:</b> %s"
 msgstr "<b>titre uniforme</b> %s"
 
-#. %1$s: TMPL_VAR name=unititle 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detailprint.tmpl:23 
+#. For the first occurrence,
+#. %1$s: TMPL_VAR name=unititle
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:69
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detailprint.tmpl:23
 #, c-format
 msgid "<b>Unititle:</b> %s"
 msgstr "<b>titre uniforme</b> %s"
 
-#. %1$s: TMPL_VAR name=volumeddesc 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:36 
+#. %1$s: TMPL_VAR name=volumeddesc
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:36
 #, c-format
 msgid "<b>Volume:</b> %s"
 msgstr "<b>Remarques:</b> %s"
 
-#. %1$s: TMPL_VAR name=copyrightdate 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detailprint.tmpl:21 
+#. For the first occurrence,
+#. %1$s: TMPL_VAR name=copyrightdate
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:67
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detailprint.tmpl:21
 #, c-format
 msgid "<b>Year :</b> %s"
 msgstr "<b>Année :</b> %s"
 
-#. For the first occurrence, 
-#. %1$s: TMPL_VAR name=publicationyear 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:33 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detailprint.tmpl:16 
+#. For the first occurrence,
+#. %1$s: TMPL_VAR name=publicationyear
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:140
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detailprint.tmpl:16
 #, c-format
 msgid "<b>in </b>%s"
 msgstr "<b>en </b>%s"
 
-#. %1$s: TMPL_VAR name=publishercode 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:32 
+#. %1$s: TMPL_VAR name=publishercode
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:139
 #, c-format
 msgid "<b>published by :</b>%s"
 msgstr "<b>publié par :</b>%s"
 
-#. %1$s: TMPL_VAR name=subtitle 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:29 
+#. %1$s: TMPL_VAR name=subtitle
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:136
 #, c-format
 msgid "<b>subtitle:</b>%s"
 msgstr "<b>sous-titre:</b>%s"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:121
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:94
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:179
 msgid "A free can be managed by any user."
 msgstr "libre peut être géré par n'importe quel utilisateur"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:120
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:93
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:178
 msgid "A public can be seen by everybody, but managed only by you."
 msgstr "public peut être vu par tous, mais géré uniquement par vous"
 
 # 
 # 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:127
-msgid "A search is done on every words you enter. Empty words are ignored. If you enter, for example \"the two towers\" in the title, the result list will contain all the books containing two AND tower in the title. The \"the\" will be discarded."
-msgstr "Une recherche est faite sur chaque mot que vous entrez. Les mots vides sont ignorés. Si vous entrez, par exemple \"les deux tours\" dans le titre, le résultat contiendra tous les mots avec deux ET tours dans le titre. \"Les\" sera ignoré"
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:148
+msgid ""
+"A search is done on every words you enter. Empty words are ignored. If you "
+"enter, for example \"the two towers\" in the title, the result list will "
+"contain all the books containing two AND tower in the title. The \"the\" "
+"will be discarded."
+msgstr ""
+"Une recherche est faite sur chaque mot que vous entrez. Les mots vides sont "
+"ignorés. Si vous entrez, par exemple \"les deux tours\" dans le titre, le "
+"résultat contiendra tous les mots avec deux ET tours dans le titre. \"Les\" "
+"sera ignoré"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:62 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:64
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:62
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:64
 msgid "Accepted"
 msgstr "Accepté"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:118
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:118
 msgid "Accepted, will be ordered soon"
 msgstr "Accepté, sera commandé rapidement"
 
-#. %1$s: TMPL_VAR name=firstname 
-#. %2$s: TMPL_VAR name=surname 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-account.tmpl:5 
+#. %1$s: TMPL_VAR name=firstname
+#. %2$s: TMPL_VAR name=surname
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-account.tmpl:5
 #, c-format
 msgid "Account for %s %s"
 msgstr "Compte %s %s"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:111
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:134
 msgid "Acquisition date"
 msgstr "date d'acquisition"
 
-#. INPUT type=submit 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:41
+#. INPUT type=submit
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:41
 msgid "Add Checked Items to Biblio Basket"
 msgstr "Ajouter les éléments cochés au panier"
 
-#. INPUT type=submit 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:126
+#. INPUT type=submit
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:97
 msgid "Add New Shelf"
 msgstr "Créer une étagère"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:106
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:82
 msgid "Add Shelf"
 msgstr "Créer une étagère"
 
-#. %1$s: TMPL_VAR name=shelfname 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:44 
-#, c-format
-msgid "Add a book by barcode in %s:"
-msgstr "Ajouter un livre par saisie du code barre dans %s"
+#
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:38
+msgid "Add a book by barcode"
+msgstr "Ajouter un livre par saisie du code barre"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl:3
+msgid "Add book to bookshelf"
+msgstr "Ajouter le livre à l'étagère virtuelle"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:155
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:145
 msgid "Add or Remove Book Shelves"
 msgstr "Créer ou Supprimer une (des) étagère(s)"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:24
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-MARCdetail.tmpl:28
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:30
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-ISBDdetail.tmpl:29
 msgid "Add to basket"
 msgstr "Ajouter au panier"
 
-#. %1$s: TMPL_VAR name=additional 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:20 
+#
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl:8
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl:20
+msgid "Add to virtual shelf"
+msgstr "Ajouter dans l'étagère virtuelle"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:36
+#
+msgid "Additional authors:"
+msgstr "Autres auteurs :"
+
+#. %1$s: TMPL_VAR name=additional
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:20
 #, c-format
 msgid "Additional authors: %s"
 msgstr "Autres auteurs : %s"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:34
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:34
 msgid "Advanced Search, More Options"
 msgstr "Recherche Avancée, Plus d'Options"
 
-#. A 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:35
+#. A
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:40
 msgid "Advanced search"
 msgstr "Recherche avancée"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-account.tmpl:10
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-account.tmpl:10
 msgid "Amount"
 msgstr "Montant"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/kohaerror.tmpl:8
+#: ../../koha-tmpl/opac-tmpl/css/en/kohaerror.tmpl:8
 msgid "An Error has Occurred"
 msgstr "Une erreur s'est produite"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:55
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:55
 msgid "Any"
 msgstr "Tout"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:13
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:13
 msgid "Any word"
 msgstr "N'importe où"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:86
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:86
 msgid "Anybody"
 msgstr "Quelqu'un"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:49 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:58
-msgid "Apr"
-msgstr "Avr"
-
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:5
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:5
 msgid "Are our records correct?"
 msgstr "Ces informations sont-elles correctes ?"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:57 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:59 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:117
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:57
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:59
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:117
 msgid "Asked"
 msgstr "Demandé"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:49 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:58
-msgid "Aug"
-msgstr "Aoû"
-
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:29 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:107 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:121 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:10 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:28 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:54 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:84
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:29
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:130
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:142
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:10
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:28
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:14
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:54
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:84
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl:5
 msgid "Author"
 msgstr "Auteur"
 
-#. %1$s: TMPL_VAR name=author 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:19 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:30
+#
+msgid "Author:"
+msgstr "Auteur:"
+
+#. %1$s: TMPL_VAR name=author
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:19
 #, c-format
 msgid "Author: %s"
 msgstr "Auteur: %s"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:120 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:77 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:79
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:138
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:77
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:79
 msgid "Available"
 msgstr "Disponible"
 
-#. %1$s: TMPL_VAR name=barcode 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:51 
+#. %1$s: TMPL_VAR name=barcode
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:51
 #, c-format
 msgid "BARCODE %s"
 msgstr "CODE A BARRES %s"
 
-#. %1$s: TMPL_VAR name=biblionumber 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detailprint.tmpl:7 
+#. %1$s: TMPL_VAR name=biblionumber
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detailprint.tmpl:7
 #, c-format
 msgid "BIBLIO RECORD %s"
 msgstr "NOTICE N° %s"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:5
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:5
 msgid "Back to biblio"
 msgstr "Retour à la notice"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:57 
 #
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:57
 msgid "Barcode"
 msgstr "Code à barres"
 
-#. SCRIPT 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:24
+#. SCRIPT
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
 msgid "Basket is empty"
 msgstr "Le panier est vide"
 
 # 
-#. SCRIPT 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:24
+#. SCRIPT
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
 msgid "Biblio added to the basket"
 msgstr "Notice ajoutée au panier"
 
-#. A 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:39
+#. A
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:44
 msgid "Biblio basket"
 msgstr "Panier de notices"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:67
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:51
 msgid "Bookshelves"
 msgstr "Etagères"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:52
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:60
 msgid "Branch"
 msgstr "Site"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:124
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:145
 msgid "Branches"
 msgstr "Sites"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:74
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-basket-menu.inc:14
+msgid "Brief Display"
+msgstr ""
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:83
 msgid "Call Number"
 msgstr "Cote du document"
 
-#. %1$s: TMPL_VAR name=wthdrawn 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:80 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:96
+#
+msgid "Call Number:"
+msgstr "Cote du document"
+
+#. %1$s: TMPL_VAR name=wthdrawn
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:80
 #, c-format
 msgid "Cancelled: %s"
 msgstr "Annulé %s"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:37
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:38
 msgid "Cannot be Reserved"
 msgstr "Ne peut être Réservé"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-auth.tmpl:28
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-auth.tmpl:28
 msgid "Cardnumber"
 msgstr "Login/identifiant"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:4
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:4
 msgid "Catalogue search"
 msgstr "Recherche dans le Catalogue"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:113
-msgid "Category :"
+#
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:85
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:109
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:158
+msgid "Category"
 msgstr "Catégorie"
 
-#. INPUT type=submit 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:80
+#. INPUT type=submit
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:80
 msgid "Change Language"
 msgstr "Changer la langue"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:58
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:58
 msgid "Charges"
 msgstr "Payant"
 
 # 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-userupdate.tmpl:14
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-userupdate.tmpl:14
 msgid "City"
 msgstr "Ville"
 
-#. %1$s: TMPL_VAR name=classification 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:29 
+#. %1$s: TMPL_VAR name=classification
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:29
 #, c-format
 msgid "Classification: %s"
 msgstr "Cote : %s"
 
-#. INPUT type=reset 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:41
+#. INPUT type=reset
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:41
 msgid "Clear All"
 msgstr "Effacer Tout"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-basket-menu.inc:12 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-sendbasketform.tmpl:21
+#. INPUT type=reset
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:69
+#
+msgid "Clear all"
+msgstr "Effacer Tout"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-basket-menu.inc:12
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasketform.tmpl:21
 msgid "Close"
 msgstr "Fermer"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:50
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:54
 msgid "Collection:"
 msgstr "Collection :"
 
-#. %1$s: TMPL_VAR name=seriestitle 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:22 
+#. %1$s: TMPL_VAR name=seriestitle
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:22
 #, c-format
 msgid "Collection: %s"
 msgstr "Collection : %s"
 
-#. %1$s: TMPL_VAR name=shelfname 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:8 
-#, c-format
-msgid "Contents of %s"
-msgstr "Contenu de %s"
+#
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:110
+msgid "Content size"
+msgstr "Contenu taille"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:30
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:31
 msgid "Copies"
 msgstr "Exemplaires"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:11
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:11
 msgid "Copyright date"
 msgstr "Date copyright"
 
-#. %1$s: TMPL_VAR name=copyrightdate 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:24 
+#. %1$s: TMPL_VAR name=copyrightdate
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:24
 #, c-format
 msgid "Copyright year: %s"
 msgstr "Date copyright : %s"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:47 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:56
-msgid "Day"
-msgstr "Jour"
-
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:49 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:58
-msgid "Dec"
-msgstr "Déc"
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:66
+#
+msgid "Copyright:"
+msgstr "Date copyright"
 
-#. INPUT type=submit 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:136
+#. INPUT type=submit
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:136
 msgid "Delete"
 msgstr "Supprimer"
 
-#. INPUT type=submit 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:97
+#. INPUT type=submit
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:75
 msgid "Delete Shelves"
 msgstr "Supprimer étagères"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:68
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:86
 msgid "Detailed notes:"
 msgstr "Notes détaillées"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:108
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:48
+#
+msgid "Details:"
+msgstr "Détails"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:131
 msgid "Dewey"
 msgstr "code Dewey"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:58
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:90
 msgid "Dewey:"
 msgstr "code Dewey :"
 
-#. %1$s: TMPL_VAR name=dewey 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:28 
+#. %1$s: TMPL_VAR name=dewey
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:28
 #, c-format
 msgid "Dewey: %s"
 msgstr "Dewey: %s"
 
-#. SCRIPT 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-basket-top.inc:18
+#. SCRIPT
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-basket-top.inc:19
 msgid "Do you want to empty the basket ?"
 msgstr "Voulez vous vider le panier ?"
 
-#. SCRIPT 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-basket-top.inc:18
+#. SCRIPT
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-basket-top.inc:19
 msgid "Do you want to remove selected biblios ?"
 msgstr "Voulez vous enlever les notices sélectionnées ?"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:55
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:55
 msgid "Due date"
 msgstr "Date de retour"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-sendbasketform.tmpl:14
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasketform.tmpl:14
 msgid "E-mail address"
 msgstr "adresse e-mail"
 
 # 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-userupdate.tmpl:17
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-userupdate.tmpl:17
 msgid "Email"
 msgstr "E-mail"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-basket-menu.inc:4
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-basket-menu.inc:4
 msgid "Empty"
 msgstr "Vider"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:54
-msgid "End reserve on this date:"
-msgstr "Annuler la réservation le :"
-
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:4 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:151
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:4
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:151
 msgid "Enter a new suggestion"
 msgstr "Saisir une nouvelle suggestion"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:49 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:58
-msgid "Feb"
-msgstr "Fév"
-
 # 
 # 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:5
-msgid "Fill this form to suggest the library a new acquisition. You will be mailed when the library treats you suggestion"
-msgstr "Remplissez ce formulaire pour suggérer une nouvelle acquisition. Vous serez prévenu par messagerie lorsque la bibliothèque traitera votre suggestion"
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:5
+msgid ""
+"Fill this form to suggest the library a new acquisition. You will be mailed "
+"when the library treats you suggestion"
+msgstr ""
+"Remplissez ce formulaire pour suggérer une nouvelle acquisition. Vous serez "
+"prévenu par messagerie lorsque la bibliothèque traitera votre suggestion"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:39
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:39
 msgid "Filter on"
 msgstr "Filtrer sur"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-account.tmpl:9
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-account.tmpl:9
 msgid "Fines & charges"
 msgstr "Amendes et charges"
 
 # 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-userupdate.tmpl:12
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-userupdate.tmpl:12
 msgid "First name"
 msgstr "Prénom"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:116
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:89
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:128
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:171
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:173
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl:17
 msgid "Free"
 msgstr "Libre"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:60
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:61
 msgid "Friday"
 msgstr "Vendredi"
 
-#. %1$s: TMPL_VAR name=email_sender 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:6 
+#. %1$s: TMPL_VAR name=email_sender
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:6
 #, c-format
 msgid "Hi, Here is the biblio basket sent by %s"
 msgstr "Bonjour, voici le panier de notices transmis par %s"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:118
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:139
 msgid "Hints"
 msgstr "Conseils"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:33
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:38
 msgid "Home"
 msgstr "Accueil"
 
 # 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-userupdate.tmpl:15
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-userupdate.tmpl:15
 msgid "Home phone"
 msgstr "Téléphone domicile"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:82
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:91
 msgid "ISBN"
 msgstr "ISBN :"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:16
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:16
 msgid "ISBN/ISSN"
 msgstr "ISBN/ISSN"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:49
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:24
 msgid "ISBN:"
 msgstr "ISBN :"
 
-#. %1$s: TMPL_VAR name=ISBN 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:17 
+#. %1$s: TMPL_VAR name=ISBN
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:17
 #, c-format
 msgid "ISBN: %s"
 msgstr "ISBN : %s"
 
 # 
 # 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:128
-msgid "If you want to enter a partial word, add a * or a % at the end of the word. For example \"two tower*\" will retrieve \"the two towers\", \"two white towers\", \"a tower and two cities\""
-msgstr "Si vous voulez entrer une partie de mot, mettez une * ou un % à la fin du mot. Par exemple, \"deux tours\" donnera \"Les deux tours\" mais aussi \"Une tour et deux maisons\""
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:149
+msgid ""
+"If you want to enter a partial word, add a * or a % at the end of the word. "
+"For example \"two tower*\" will retrieve \"the two towers\", \"two white "
+"towers\", \"a tower and two cities\""
+msgstr ""
+"Si vous voulez entrer une partie de mot, mettez une * ou un % à la fin du "
+"mot. Par exemple, \"deux tours\" donnera \"Les deux tours\" mais aussi \"Une "
+"tour et deux maisons\""
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:5
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:5
 msgid "Impossible to set reserve because"
 msgstr "Impossible d'établir la réservation parce que"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:21
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-MARCdetail.tmpl:25
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:27
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-ISBDdetail.tmpl:26
 msgid "Issues"
 msgstr "Prêts"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:4
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:4
 msgid "Issues for a subscription"
 msgstr "Bulletins"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:77
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:79
 msgid "Issues summary"
 msgstr "Abrégé des numéros"
 
-#. %1$s: TMPL_VAR name=startdate 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:9 
+#. %1$s: TMPL_VAR name=startdate
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:10
 #, c-format
 msgid "It began on <b>%s</b> and is issued every <b>"
 msgstr "Débutant le <b>%s</b> et paraissant chaque<b>"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:99
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:117
 msgid "Item"
 msgstr "Exemplaire"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:45
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:45
 msgid "Item Count"
 msgstr "Nombre d'exemplaires"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:29 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:44
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:30
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:52
 msgid "Item Type"
 msgstr "Type de document"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:66
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:75
 msgid "Item barcode"
 msgstr "Code à barres"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-MARCdetail.tmpl:226
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:72
+#
+msgid "Item type :"
+msgstr "Type de document"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-MARCdetail.tmpl:236
 msgid "Items"
 msgstr "Exemplaires"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:56
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:56
 msgid "Itemtype"
 msgstr "Type de document"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:49 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:58
-msgid "Jan"
-msgstr "Janv"
-
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:49 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:58
-msgid "Jul"
-msgstr "Juil"
-
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:49 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:58
-msgid "Jun"
-msgstr "Juin"
-
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-auth.tmpl:27
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-auth.tmpl:27
 msgid "Koha Login"
 msgstr "Identification"
 
-#. A 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:33
+#. A
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:38
 msgid "Koha home page"
 msgstr "Page d'accueil Koha"
 
-#. %1$s: TMPL_VAR name=lccn 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:30 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:102
+#
+msgid "LCCN:"
+msgstr "LCCN"
+
+#. %1$s: TMPL_VAR name=lccn
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:30
 #, c-format
 msgid "LCCN: %s"
 msgstr "LCCN : %s"
 
-#. %1$s: TMPL_VAR name=cardnumber 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:6 
+#. %1$s: TMPL_VAR name=cardnumber
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:6
 #, c-format
 msgid "Library Card: %s"
 msgstr "Identifiant %s"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:46
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:46
 msgid "Location"
 msgstr "Localisation"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-bottom.inc:5
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-bottom.inc:5
 msgid "Log Out"
 msgstr "Déconnexion"
 
-#. %1$s: TMPL_VAR name=loggedinusername 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-bottom.inc:4 
+#. %1$s: TMPL_VAR name=loggedinusername
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-bottom.inc:4
 #, c-format
 msgid "Logged in as <b>%s</b> <a1>Members Home</a>"
 msgstr "Connecté en tant que <b>%s</b> <a1>Accueil Membre</a>"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:33
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:33
 msgid "Managed by"
 msgstr "Géré par"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:49 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:58
-msgid "Mar"
-msgstr "Mar"
-
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:49 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:58
-msgid "May"
-msgstr "Mai"
-
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:85
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:85
 msgid "Me"
 msgstr "Me"
 
-#. A 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:37
+#. A
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:42
 msgid "Member Home page"
 msgstr "Page d'accueil Membre"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-userupdate.tmpl:4
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-userupdate.tmpl:4
 msgid "Member information change"
 msgstr "Modifier vos informations"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:68
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:68
 msgid "Message from the library"
 msgstr "Commandé par la bibliothèque"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:48
+#
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:111
+msgid "Modify"
+msgstr "modifier"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:154
+msgid "Modify shelf"
+msgstr "Modifier l'étagère"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:49
 msgid "Monday"
 msgstr "Lundi"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:49 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:58
-msgid "Month"
-msgstr "Mois"
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-basket-menu.inc:16
+msgid "More Details"
+msgstr ""
 
-#. %1$s: TMPL_VAR name=biblionumber 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:3 
+#. %1$s: TMPL_VAR name=biblionumber
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:3
 #, c-format
 msgid "N&#176;%s)"
 msgstr "N°%s)"
 
-#. %1$S: type=text name=addshelf 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:111 
-#, c-format
-msgid "Name : %S"
-msgstr "Nom : %S"
+#
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:83
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:156
+msgid "Name"
+msgstr "Nom"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:25 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:125
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:25
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:135
 msgid "Next &gt;&gt;"
 msgstr "Suivant >>"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:102
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:112
 msgid "Next &gt;&gt;&gt;"
 msgstr "Suivant >>>"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:68 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:69
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:68
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:69
 msgid "No"
 msgstr "Non"
 
-#. For the first occurrence, 
-#. SCRIPT 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-basket-top.inc:18 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:24
+#. For the first occurrence,
+#. SCRIPT
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-basket-top.inc:19
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
 msgid "No biblio added"
 msgstr "Aucune notice ajoutée"
 
-#. For the first occurrence, 
-#. SCRIPT 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-basket-top.inc:18 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:24
+#. For the first occurrence,
+#. SCRIPT
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-basket-top.inc:19
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
 msgid "No biblio selected"
 msgstr "Aucune notice sélectionnée"
 
 # 
 # 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:6
-msgid "No fields are mandatory. Fill whatever you know. The \"Note\" field can be used for whatever you want"
-msgstr "Aucun champ obligatoire. Remplissez les champs que vous connaissez. Le champ \"Note\" peut être utilisé pour ce que vous voulez"
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:6
+msgid ""
+"No fields are mandatory. Fill whatever you know. The \"Note\" field can be "
+"used for whatever you want"
+msgstr ""
+"Aucun champ obligatoire. Remplissez les champs que vous connaissez. Le champ "
+"\"Note\" peut être utilisé pour ce que vous voulez"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:86
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:96
 msgid "Not Reservable"
 msgstr "Non Réservable"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:17 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:34
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:17
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:34
 msgid "Note"
 msgstr "Remarque"
 
 # 
 # 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:153
-msgid "Note : if you ask suggestion done by anybody, the result will contain only new suggestions. Suggestions treated by a librarian will not be shown."
-msgstr "Note : si vous filtrez sur les suggestions faites par n'importe qui, la liste ne contiendra que les suggestions nouvelles. Les suggestions déjà traitées par un bibliothécaire n'apparaitront pas"
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:153
+msgid ""
+"Note : if you ask suggestion done by anybody, the result will contain only "
+"new suggestions. Suggestions treated by a librarian will not be shown."
+msgstr ""
+"Note : si vous filtrez sur les suggestions faites par n'importe qui, la "
+"liste ne contiendra que les suggestions nouvelles. Les suggestions déjà "
+"traitées par un bibliothécaire n'apparaitront pas"
 
-#. %1$s: TMPL_VAR name=fee 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:88 
+#. %1$s: TMPL_VAR name=fee
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:73
 #, c-format
 msgid "Note there will be a reserve charge of <b>$%s</b>"
 msgstr "Notez qu'il y aura un coût de <b>$%s</b> pour la réservation"
 
-#. %1$s: TMPL_VAR name=notes 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:25 
+#. %1$s: TMPL_VAR name=notes
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:25
 #, c-format
 msgid "Notes : %s"
 msgstr "Remarques : %s"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:56
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:72
 msgid "Notes:"
 msgstr "Remarques:"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:49 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:58
-msgid "Nov"
-msgstr "Nov"
-
-#. INPUT type=submit 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:31 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:49
+#. INPUT type=submit
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:31
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:49
 msgid "OK"
 msgstr "OK"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-basket-top.inc:6
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-basket-top.inc:6
 msgid "OPAC Basket"
 msgstr "Panier"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:49 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:58
-msgid "Oct"
-msgstr "Oct"
-
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:119
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:137
 msgid "Online"
 msgstr "En ligne"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:67 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:69
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:67
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:69
 msgid "Ordered"
 msgstr "Commandé"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:104
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:127
 msgid "Ordered by"
 msgstr "Trié par"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:119
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:119
 msgid "Ordered by the library"
 msgstr "Commandé par la bibliothèque"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:52 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:64
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:52
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:73
 msgid "Other options"
 msgstr "Autres options"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:112
-msgid "Owner :"
+#
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:84
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:157
+msgid "Owner"
 msgstr "Propriétaire"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:126
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:147
 msgid "Partial search"
 msgstr "Commencer la recherche"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-auth.tmpl:29
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-auth.tmpl:29
 msgid "Password"
 msgstr "Mot de passe"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:37
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:42
 msgid "Personal page"
 msgstr "Vos informations"
 
-#. INPUT type=submit 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:90
+#. INPUT type=submit
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:75
 msgid "Place Reserve"
 msgstr "Faire une Réservation"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-userupdate.tmpl:5
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-userupdate.tmpl:5
 msgid "Please change what's needed. An email will be sent to the library."
-msgstr "Merci de changer ce qui doit l'être. Un message sera envoyé à  la bibliothèque."
+msgstr ""
+"Merci de changer ce qui doit l'être. Un message sera envoyé à  la "
+"bibliothèque."
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:68
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:53
 msgid "Please confirm that you wish to request an item of these types:"
-msgstr "Merci de confirmer que vous souhaitez demander un document de ces types"
+msgstr ""
+"Merci de confirmer que vous souhaitez demander un document de ces types"
 
-#. %1$s: TMPL_VAR name=CGIbranch 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:44 
+#. %1$s: TMPL_VAR name=CGIbranch
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:45
 #, c-format
 msgid "Please select the branch from which you want to collect the item: %s"
-msgstr "Merci de sélectionner l'annexe où vous souhaitez récupérer le document %s"
+msgstr ""
+"Merci de sélectionner l'annexe où vous souhaitez récupérer le document %s"
 
 # 
 # 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:21
-msgid "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."
-msgstr "Sélectionnez les types de documents qui vous conviennent. Le premier qui correspondra à votre souhait sera mis de coté lorsqu'il sera disponible"
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:22
+msgid ""
+"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."
+msgstr ""
+"Sélectionnez les types de documents qui vous conviennent. Le premier qui "
+"correspondra à votre souhait sera mis de coté lorsqu'il sera disponible"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-basket-menu.inc:10
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-basket-menu.inc:10
 msgid "Print"
 msgstr "Imprimer"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:114
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:87
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:122
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:161
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:163
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl:15
 msgid "Private"
 msgstr "Privé"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-sendbasketform.tmpl:9
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasketform.tmpl:9
 msgid "Problem sending the basket..."
 msgstr "Problème lors de l'envoi du panier"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:115
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:88
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:125
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:166
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:168
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl:16
 msgid "Public"
 msgstr "Public"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:109
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:132
 msgid "Publication Year"
 msgstr "Année de Publication"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:15
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:15
 msgid "Publication place"
 msgstr "Lieu de Publication"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:14
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:14
 msgid "Publication year"
 msgstr "Année de Publication"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:45
+#
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:107
+msgid "Published between"
+msgstr "Publié entre"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:57
 msgid "Published by :"
 msgstr "Publié par :"
 
-#. %1$s: TMPL_VAR name=publishercode 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:21 
+#. %1$s: TMPL_VAR name=publishercode
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:21
 #, c-format
 msgid "Published by: %s"
 msgstr "Publié par : %s"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:90 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:110 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:12 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:30
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:99
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:133
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:12
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:30
 msgid "Publisher"
 msgstr "Editeur"
 
-#. %1$S: type=text name=value 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:31 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:42
+#
+msgid "Publisher:"
+msgstr "Editeur"
+
+#. %1$S: type=text name=value
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:31
 #, c-format
 msgid "Quick search : %S"
 msgstr "Recherche simple : %S"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:38
+#
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:121
+msgid "Received by the library"
+msgstr "Reçu par la bibliothèque"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:38
 msgid "Recent acquisitions"
 msgstr "Acquisitions récentes"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:121
-msgid "Recieved by the library"
-msgstr "Reçu par la bibliothèque"
-
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:72 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:74
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:72
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:74
 msgid "Rejected"
 msgstr "Rejeté"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:80
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:98
 msgid "Related links:"
 msgstr "Liens en relation"
 
 # 
 # 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:123
-msgid "Remember that a title can concern a physical author (Victor Hugo) or a company, group, collective author (CNRS, Library of Congress)"
-msgstr "N'oubliez pas qu'un auteur peut concerner un auteur physique (Victor Hugo) ou moral (CNRS...)"
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:144
+msgid ""
+"Remember that a title can concern a physical author (Victor Hugo) or a "
+"company, group, collective author (CNRS, Library of Congress)"
+msgstr ""
+"N'oubliez pas qu'un auteur peut concerner un auteur physique (Victor Hugo) "
+"ou moral (CNRS...)"
 
-#. INPUT type=submit 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:33
+#. INPUT type=submit
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:29
 msgid "Remove Selected Items"
 msgstr "Supprimer les documents sélectionnés"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-basket-menu.inc:6
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-basket-menu.inc:6
 msgid "Remove selection"
 msgstr "Supprimer la sélection"
 
 # 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:59
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:59
 msgid "Renewable"
 msgstr "Renouvelable"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-MARCdetail.tmpl:16 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:84 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:16 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:28 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-ISBDdetail.tmpl:15
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-MARCdetail.tmpl:20
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:94
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:22
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:29
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-ISBDdetail.tmpl:21
 msgid "Request"
 msgstr "Réserver"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:85
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:85
 msgid "Reserve date"
 msgstr "Date de réservation"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:45
-msgid "Reserve on this date:"
-msgstr "Réserver à cette date :"
-
-#. %1$s: TMPL_VAR name=title 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:3 
+#. %1$s: TMPL_VAR name=title
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:3
 #, c-format
 msgid "Reserve page for <i>%s</i>"
 msgstr "Page des réservations pour <i>%s</i>"
 
-#. %1$s: TMPL_VAR name=startfrom 
-#. %2$s: TMPL_VAR name=endat 
-#. %3$s: TMPL_VAR name=numrecords 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/subject.tmpl:17 
+#. %1$s: TMPL_VAR name=startfrom
+#. %2$s: TMPL_VAR name=endat
+#. %3$s: TMPL_VAR name=numrecords
+#: ../../koha-tmpl/opac-tmpl/css/en/subject.tmpl:17
 #, c-format
 msgid "Results %s through %s of %s records."
 msgstr "Résultats %s à %s sur %s réponses"
 
-#. For the first occurrence, 
-#. %1$s: TMPL_VAR name=from 
-#. %2$s: TMPL_VAR name=to 
-#. %3$s: TMPL_VAR name=total 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:31 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:111 
+#. For the first occurrence,
+#. %1$s: TMPL_VAR name=from
+#. %2$s: TMPL_VAR name=to
+#. %3$s: TMPL_VAR name=total
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:31
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:121
 #, c-format
 msgid "Results <b><i>%s</i> through <i>%s</i> of <i>%s</i></b>"
 msgstr "Réponses <i>%s</i> à <i>%s</i> sur <i>%s</i> réponses."
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:97
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:120
 msgid "Results per page :"
 msgstr "Réponses par page"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:63
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:64
 msgid "Saturday"
 msgstr "Samedi"
 
-#. INPUT type=submit 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:50
+#. INPUT type=submit
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:45
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:182
 msgid "Save"
 msgstr "Enregistrer"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:9
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:9
 msgid "Search on"
 msgstr "Chercher dans"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:22
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:22
 msgid "Search the catalogue"
 msgstr "Chercher"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:82
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:61
 msgid "Select Shelves to Delete"
 msgstr "Sélectionner les étagères virtuelles à supprimer"
 
 # 
 # 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:125
-msgid "Select a branch if you want to limit your search to items in a specific branch. By default the search is done on every branches of the library"
-msgstr "Sélectionnez une annexe si vous voulez limiter votre recherche à un site ne particulier. Par défaut, la recherche sera faite sur tous les sites de la bibliothèque"
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:146
+msgid ""
+"Select a branch if you want to limit your search to items in a specific "
+"branch. By default the search is done on every branches of the library"
+msgstr ""
+"Sélectionnez une annexe si vous voulez limiter votre recherche à un site ne "
+"particulier. Par défaut, la recherche sera faite sur tous les sites de la "
+"bibliothèque"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl:6
+msgid "Select bookshelf"
+msgstr "Sélectionnez l'étagère"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:17
+#
+msgid "Select this Item"
+msgstr "Sélectionner ce document"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-basket-menu.inc:8 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-sendbasketform.tmpl:15
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-basket-menu.inc:8
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasketform.tmpl:15
 msgid "Send"
 msgstr "Envoyer"
 
-#. INPUT type=submit 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:18
+#. INPUT type=submit
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:18
 msgid "Send suggestion to the library staff"
 msgstr "Envoyer la suggestion à l'équipe de la bibliothèque"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-sendbasketform.tmpl:4
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasketform.tmpl:4
 msgid "Sending the basket"
 msgstr "Envoyer le panier"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:49 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:58
-msgid "Sep"
-msgstr "Sept"
-
-#. A 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:20
+#. A
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-MARCdetail.tmpl:24
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:26
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-ISBDdetail.tmpl:25
 msgid "Serial issues"
 msgstr "Bulletins"
 
-#. %1$s: TMPL_VAR name=serial 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:27 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:84
+#
+msgid "Serial:"
+msgstr "Collection"
+
+#. %1$s: TMPL_VAR name=serial
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:27
 #, c-format
 msgid "Serial: %s"
 msgstr "Bulletin : %s"
 
-#. INPUT type=submit 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:93
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:44
+msgid "Series title"
+msgstr "Titre périodique/collection"
+
+#. INPUT type=submit
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:93
 msgid "Set Filter"
 msgstr "Etablir un filtre"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:137
-msgid "Shelf List"
-msgstr "Liste de l'étagère virtuelle"
+#
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:8
+msgid "Shelf content"
+msgstr "Contenu de l'étagère virtuelle"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:28 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:73
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:31
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:105
 msgid "Shelf list"
 msgstr "Liste de l'étagère virtuelle"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-auth.tmpl:5
+#
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:108
+msgid "Shelf name"
+msgstr "Nom de l'étagère virtuelle"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-auth.tmpl:5
 msgid "Sorry, KOHA doesnt think you have permission for this page."
 msgstr "Désolé, Koha pense que vous ne pouvez pas accéder à cette page."
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:131
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:141
 msgid "Sorry, there were no results"
 msgstr "Désolé, il n'y a aucun résultat"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-auth.tmpl:10
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-auth.tmpl:10
 msgid "Sorry, your session has timed out, please login again."
 msgstr "Désolé, votre session a expiré, merci de vous reconnecter"
 
-#. INPUT type=submit 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:60
+#. INPUT type=submit
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:68
 msgid "Start search"
 msgstr "Lancer la recherche"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:31
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:31
 msgid "Status"
 msgstr "Etat"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-account.tmpl:11
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-account.tmpl:11
 msgid "Still owing"
 msgstr "Dettes"
 
 # 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-userupdate.tmpl:13
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-userupdate.tmpl:13
 msgid "Street address"
 msgstr "Adresse postale"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:36 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/subject.tmpl:7
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:36
+#: ../../koha-tmpl/opac-tmpl/css/en/subject.tmpl:7
 msgid "Subject"
 msgstr "Mot-clef"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:51 
 #
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:63
 msgid "Subject(s):"
 msgstr "Mot-clef :"
 
-#. %1$s: TMPL_VAR name=subject 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:23 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:60
+#
+msgid "Subject:"
+msgstr "Mot-clef"
+
+#. %1$s: TMPL_VAR name=subject
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:23
 #, c-format
 msgid "Subject: %s"
 msgstr "Mot-clef : %s"
 
-#. INPUT type=submit 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:62 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-userupdate.tmpl:18
+#. INPUT type=submit
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:47
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-userupdate.tmpl:18
 msgid "Submit"
 msgstr "Soumettre"
 
-#. %1$s: TMPL_VAR name=bibliotitle 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:8 
+#. %1$s: TMPL_VAR name=bibliotitle
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:9
 #, c-format
 msgid "Subscription information for %s"
 msgstr "Information d'abonnement pour%s"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:42
-msgid "Subtitle:"
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:49
+#
+msgid "Subtitle(s):"
 msgstr "Sous-titre:"
 
-#. %1$s: TMPL_VAR name=subtitle 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:18 
+#. %1$s: TMPL_VAR name=subtitle
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:18
 #, c-format
 msgid "Subtitle: %s"
 msgstr "Sous-titre: %s"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:32
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:32
 msgid "Suggested by"
 msgstr "Suggéré par"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:120
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:120
 msgid "Suggestion rejected : won't be buy"
 msgstr "Suggestion rejetée : ne sera pas acheté"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:23
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:23
 msgid "Suggestions"
 msgstr "Suggestions d'achat"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:44
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:44
 msgid "Summary"
 msgstr "Sommaire"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:66
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:67
 msgid "Sunday"
 msgstr "Dimanche"
 
 # 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-userupdate.tmpl:10
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-userupdate.tmpl:10
 msgid "Surname"
 msgstr "Nom"
 
-#. %1$s: TMPL_VAR name=email_add 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-sendbasketform.tmpl:7 
+#. %1$s: TMPL_VAR name=email_add
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasketform.tmpl:7
 #, c-format
 msgid "The basket was sent to: %s"
 msgstr "Le panier a été envoyé à : %s"
 
-#. %1$s: TMPL_VAR name=reservecount 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:20 
+#. %1$s: TMPL_VAR name=reservecount
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:21
 #, c-format
 msgid "There are <b>%s</b> reserves already on this item."
 msgstr "Il y a déjà <b>%s</b> réservations pour ce document"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:83 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:83
 #, c-format
-msgid "This Library is powered by <a1>Koha</a> free software ILS, and compliant with web standards <a2>"
-msgstr "Cette bibliothèque est équipée de <a1>Koha</a>, SIGB sous licence libre, respectueuse des standards du web <a2>"
+msgid ""
+"This Library is powered by <a1>Koha</a> free software ILS, and compliant "
+"with web standards <a2>"
+msgstr ""
+"Cette bibliothèque est équipée de <a1>Koha</a>, SIGB sous licence libre, "
+"respectueuse des standards du web <a2>"
 
-#. SCRIPT 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:24
+#. SCRIPT
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
 msgid "This biblio is already in the basket"
 msgstr "Cette notice est déjà dans le panier"
 
 # 
 # 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:13
-msgid "This card has been declared lost. Reserve impossible. Please contact the library"
-msgstr "La carte a été déclarée perdue. La réservation est impossible, contactez la bibliothèque"
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:14
+msgid ""
+"This card has been declared lost. Reserve impossible. Please contact the "
+"library"
+msgstr ""
+"La carte a été déclarée perdue. La réservation est impossible, contactez la "
+"bibliothèque"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:128 
+#. %1$s: TMPL_VAR name=subscriptionsnumber
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:146
 #, c-format
-msgid "This is a serial subscription. You can see which <a1> Issues </a> we have and don't have"
-msgstr "Il s'agit d'un abonnement. Vous pouvez voir les <a1>numéros</a> que nous avons et/ou n'avons pas"
+msgid ""
+"This is a serial subscription (we have %s subscriptions). You can see which "
+"<a1> Issues </a> we have and don't have"
+msgstr ""
+"Il s'agit d'un abonnement (nous avons %s abonnements). Vous pouvez voir les "
+"<a1>numéros</a> que nous avons et/ou n'avons pas"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:57
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:58
 msgid "Thursday"
 msgstr "Jeudi"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:21 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:106 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:119 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:9 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:27 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-userupdate.tmpl:11 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:53 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:83
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:21
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:129
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:140
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:9
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:27
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-userupdate.tmpl:11
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:53
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:83
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl:4
 msgid "Title"
 msgstr "Titre"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-account.tmpl:34
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-account.tmpl:34
 msgid "Total Due"
 msgstr "Somme due"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:135 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:145
 #, c-format
 msgid "Try another <a1>Advanced search</a>"
 msgstr "<a1>Autre recherche</a>"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:51
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:52
 msgid "Tuesday"
 msgstr "Mardi"
 
-#. %1$s: TMPL_VAR name=url 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:31 
+#. %1$s: TMPL_VAR name=url
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:31
 #, c-format
 msgid "URL : %s"
 msgstr "URL : %s"
 
-#. %1$s: TMPL_VAR name=unititle 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:26 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:108
+#
+msgid "URL:"
+msgstr "URL :"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:78
+#
+msgid "Unified title:"
+msgstr "Titre uniforme : "
+
+#. %1$s: TMPL_VAR name=unititle
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:26
 #, c-format
 msgid "Unified title: %s"
 msgstr "Titre uniforme : %s"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:57
-msgid "Unititle:"
-msgstr "Titre uniforme : %s"
-
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:12
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:12
 msgid "Update Record"
 msgstr "Mettre à jour"
 
-#. IMG 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:85
+#. IMG
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:85
 msgid "Valid XHTML 1.0!"
 msgstr "XHTML 1.0 valide !"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:58
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:58
 msgid "View & manage suggestions"
 msgstr "Voir et gérer les suggestions"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:17 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:24 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:31
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:17
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:24
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:31
 msgid "View Accounts"
 msgstr "Voir le compte"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:55
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:55
 msgid "Virtual shelves"
 msgstr "Etagères virtuelles"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:13
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:13
 msgid "Volume"
 msgstr "Volume"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:118
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:136
 msgid "Website"
 msgstr "Site Web"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:54
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:55
 msgid "Wednesday"
 msgstr "Mercredi"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:80
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:65
 msgid "Which is to be picked up from"
 msgstr "Qui doit être récupéré à"
 
 # 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-userupdate.tmpl:16
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-userupdate.tmpl:16
 msgid "Work/Fax phone"
 msgstr "N° de téléphone/fax bureau"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:51 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:60
-msgid "Year"
-msgstr "Année"
-
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:55
-msgid "Year :"
-msgstr "Année :"
-
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:68 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:69
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:68
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:69
 msgid "Yes"
 msgstr "Oui"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-auth.tmpl:15
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-auth.tmpl:15
 msgid "You are accessing koha from a different ip address! please login again."
-msgstr "Vous accédez déjà à Koha à partir d'une autre adresse IP ! Merci de vous reconnecter"
+msgstr ""
+"Vous accédez déjà à Koha à partir d'une autre adresse IP ! Merci de vous "
+"reconnecter"
 
 # 
 # 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:12
-msgid "You are gone without address. Reservation is forbidden. Please contact the library"
-msgstr "Vous êtes parti sans laisser d'adresse. La réservation est refusée. Contactez votre bibliothèque"
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:13
+msgid ""
+"You are gone without address. Reservation is forbidden. Please contact the "
+"library"
+msgstr ""
+"Vous êtes parti sans laisser d'adresse. La réservation est refusée. "
+"Contactez votre bibliothèque"
 
 # 
 # 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:120
-msgid "You can enter a complete or a part of a title. The search will also be done in subtitles and other title related fields"
-msgstr "Vous pouvez entrer un titre complet ou partiel. La recherche sera faite aussi sur les sous titre et les autres champs relatifs au titre"
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:141
+msgid ""
+"You can enter a complete or a part of a title. The search will also be done "
+"in subtitles and other title related fields"
+msgstr ""
+"Vous pouvez entrer un titre complet ou partiel. La recherche sera faite "
+"aussi sur les sous titre et les autres champs relatifs au titre"
 
 # 
 # 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:122
-msgid "You can enter a name or a surname. The search will also be done in additional authors and other author related fields (translator, illustrator...)"
-msgstr "Vous pouvez entrer un nom ou un prénom. La recherche est aussi faite sur les co-auteurs et les autres champs en relation (traducteur, illustrateur...)"
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:143
+msgid ""
+"You can enter a name or a surname. The search will also be done in "
+"additional authors and other author related fields (translator, "
+"illustrator...)"
+msgstr ""
+"Vous pouvez entrer un nom ou un prénom. La recherche est aussi faite sur les "
+"co-auteurs et les autres champs en relation (traducteur, illustrateur...)"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:7
+msgid "You can't make reserve in this library (feature unactivated)"
+msgstr ""
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:9
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:9
 msgid "You did not specify any search criteria"
 msgstr "Vous n'avez précisé aucun critère de recherche"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-auth.tmpl:20
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-auth.tmpl:20
 msgid "You entered an incorrect username or password, please try again."
-msgstr "Vous avez saisi un nom de membre ou mot de passe invalide, merci de réessayer."
+msgstr ""
+"Vous avez saisi un nom de membre ou mot de passe invalide, merci de "
+"réessayer."
 
-#. %1$s: TMPL_VAR name=issues_count 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:50 
+#. %1$s: TMPL_VAR name=issues_count
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:50
 #, c-format
 msgid "You have <b>%s</b> items currently issued."
 msgstr "Vous avez <b>%s</b> document(s) en cours de prêt"
 
-#. %1$s: TMPL_VAR name=reserves_count 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:80 
+#. %1$s: TMPL_VAR name=reserves_count
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:80
 #, c-format
 msgid "You have <b>%s</b> items currently reserved."
 msgstr "Vous avez <b>%s</b> document(s) actuellement réservés"
 
-#. %1$s: TMPL_VAR name=amountoutstanding 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:30 
+#. %1$s: TMPL_VAR name=amountoutstanding
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:30
 #, c-format
 msgid "You have a credit of %s"
 msgstr "Vous avez un crédit de %s"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:74
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:74
 msgid "You have no items on issue."
 msgstr "Vous n'avez pas de document en prêt"
 
-#. For the first occurrence, 
-#. %1$s: TMPL_VAR name=amountoutstanding 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:16 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:23 
+#. For the first occurrence,
+#. %1$s: TMPL_VAR name=amountoutstanding
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:16
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:23
 #, c-format
 msgid "You have outstanding charges and fines of %s"
 msgstr "Vous devez %s"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:39
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:39
 msgid "You have reserved items waiting:"
 msgstr "Des document réservés vous attendent :"
 
-#. %1$s: TMPL_VAR name=searchdesc 
-#. %2$s: TMPL_VAR name=total 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:4 
+#. %1$s: TMPL_VAR name=searchdesc
+#. %2$s: TMPL_VAR name=total
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:4
 #, c-format
 msgid "You searched on <b>%s</b>. %s results found"
 msgstr "Recherche sur <b>%s</b>. %s réponses trouvées"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:14
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:15
 msgid "Your account is temporarily suspended. Please contact the library"
 msgstr "Votre compte est suspendu temporairement. Contactez la bibliothèque"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:2 
 #
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:2
 msgid "Your biblio basket"
 msgstr "Votre panier de notices"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-userupdate.tmpl:6
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-userupdate.tmpl:6
 msgid "Your changes won't appear until the library has validated them."
-msgstr "Vos modifications n'apparaîtront pas avant la validation de la bibliothèque"
+msgstr ""
+"Vos modifications n'apparaîtront pas avant la validation de la bibliothèque"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:119
-msgid "a private bookshelf is managed by you & can be seen only by you."
-msgstr "Une étagère virtuelle privée est gérée par vous seul, et ne peut être vue que de vous."
+#
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:92
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:177
+msgid "a private bookshelf is managed by you &amp; can be seen only by you."
+msgstr ""
+"Une étagère virtuelle privée est gérée par vous seul, et ne peut être vue "
+"que de vous."
 
 # 
-#. SCRIPT 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:24
+#. SCRIPT
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
 msgid "already in the basket"
 msgstr "Envoyer le panier"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:105
+#
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:98
+msgid "back to shelf list"
+msgstr "Retour à l'étagère virtuelle"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:123
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:12
 msgid "barcode"
 msgstr "code à barres"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:11
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:11
 msgid "basket.txt"
 msgstr "basket.txt"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:103
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:121
 msgid "date Due"
 msgstr "Date de retour"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:12
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:13
 msgid "day"
 msgstr "jour"
 
-#. INPUT type=image name=delete 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:24 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:63
+#. INPUT type=image name=delete
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:24
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:63
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:11
 msgid "delete"
 msgstr "Supprimer"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:69
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:70
 msgid "for"
 msgstr "pour"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:46 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:21
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:58
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:21
 msgid "in"
 msgstr "en"
 
-#. IMG 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:17
+#. IMG
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:17
 msgid "koha"
 msgstr "Koha"
 
-#. IMG 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
+#. IMG
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:34
 msgid "koha logo"
 msgstr "Logo Koha"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:104
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:122
 msgid "last Seen"
 msgstr "Vu pour la dernière fois"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:102
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:120
 msgid "location"
 msgstr "Localisation"
 
-#. INPUT type=submit 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-auth.tmpl:33
+#. INPUT type=submit
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-auth.tmpl:33
 msgid "login"
 msgstr "S'identifier"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-sendbasketform.tmpl:13
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasketform.tmpl:13
 msgid "mail sent by"
 msgstr "Message envoyé par"
 
-#. INPUT type=image name=submit 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:22 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:61
+#. INPUT type=image name=submit
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:22
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:61
 msgid "modify"
 msgstr "modifier"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:24
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:25
 msgid "month"
 msgstr "mois"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:45
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:46
 msgid "on"
 msgstr "Le"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:68
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:68
 msgid "on issue bit"
 msgstr "Indicateur de prêt"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:33
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl:11
+msgid "or add to a new bookshelf"
+msgstr "ou ajouter dans une nouvelle étagère"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/popup-top.inc:5
+msgid "popup"
+msgstr "popup"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:34
 msgid "quarter"
 msgstr "trimestre"
 
-#. %1$s: TMPl_VAR name=startdate 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:74 
+#. %1$s: TMPl_VAR name=startdate
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:75
 #, c-format
 msgid "since <b>%s</b>"
 msgstr "depuis <b>%s</b>"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:15
+#. META http-equiv=Content-Type
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-basket-top.inc:7
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:12
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/popup-top.inc:6
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:11
+msgid "text/html; charset=iso-8859-1"
+msgstr "text/html; charset=iso-8859-1"
+
+#
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:13
+msgid "title"
+msgstr "Titre"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:16
 msgid "week"
 msgstr "semaine"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:39
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:40
 msgid "year"
 msgstr "année"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:9
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:10
 msgid "you already have a reserve placed on this item."
 msgstr "Vous avez déjà une réservation en cours pour ce document"
 
-#. %1$s: TMPL_VAR name=too_many_reserves 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:8 
+#. %1$s: TMPL_VAR name=too_many_reserves
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:9
 #, c-format
 msgid "you cannot make more than %s reserves."
 msgstr "vous ne pouvez faire plus de %s réservations"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:11
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:12
 msgid "you must select a branch for pickup!"
 msgstr "Vous devez sélectionner une annexe de retrait !"
 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:10
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:11
 msgid "you must select at least on item type!"
 msgstr "Vous devez sélectionner au moins un type de document !"
 
-#. %1$s: TMPL_VAR name=too_much_oweing 
-#: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:7 
+#. %1$s: TMPL_VAR name=too_much_oweing
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:8
 #, c-format
 msgid "you owe %s"
 msgstr "vous devez %s"
 
-#~ msgid "%s(record %s)" 
-#~ msgstr "%s(enregistrement %s)" 
-#~ msgid "ISBD : %s" 
-#~ msgstr "ISBD : %s"
-msgid ""
-msgstr ""
+#~ msgid "%s (record %s)"
+#~ msgstr "%s (enregistrement %s)"
+
+#~ msgid "<b>Item type : </b>%s"
+#~ msgstr "<b>Type de document : </b>%s"
+
+#~ msgid "Unititle:"
+#~ msgstr "Titre uniforme : %s"
 
+#~ msgid "Year :"
+#~ msgstr "Année :"
diff --git a/misc/translator/po/css_opac_it_IT.po b/misc/translator/po/css_opac_it_IT.po
new file mode 100644
index 0000000000..46fa00113d
--- /dev/null
+++ b/misc/translator/po/css_opac_it_IT.po
@@ -0,0 +1,1916 @@
+# Penbwrdd yn Gymraeg.
+# Copyright (C) 2003 Free Software Foundation, Inc.
+# www.kyfieithu.co.uk<kyfieithu@dotmon.com>, www.gyfieithu.co.uk<kyfieithu@dotmon.com>, 2003.
+#
+#
+msgid ""
+msgstr ""
+
+#. SCRIPT 
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:28
+msgid "Biblio(s) added"
+msgstr "Scheda(e) aggiunta(e)"
+
+#. %1$S: type=text name=value 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:111 
+#, c-format
+msgid "%S and"
+msgstr "%S e"
+
+#. %1$s: TMPL_VAR name=firstname 
+#. %2$s: TMPL_VAR name=surname 
+#. %3$s: TMPL_VAR name=title 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:7 
+#, c-format
+msgid "%s %s (%s)"
+msgstr "%s %s (%s)"
+
+#. %1$s: TMPL_VAR name=title 
+#. %2$s: TMPL_VAR name=author 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:9 
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#. %1$s: TMPL_VAR name=phone 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:9 
+#, c-format
+msgid "%s (hm)"
+msgstr "%s (abitazione)"
+
+#. %1$s: TMPL_VAR name=title 
+#. %2$s: TMPL_VAR name=biblionumber 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:43 
+#, c-format
+msgid "%s (record %s)"
+msgstr "%s (registrazione %s)"
+
+#. %1$s: TMPL_VAR name=faxnumber 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:10 
+#, c-format
+msgid "%s (wk)"
+msgstr "%s (lavoro)"
+
+#. %1$s: TMPL_VAR name=biblioitemnumber 
+#. %2$s: TMPL_VAR name=description 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:17 
+#, c-format
+msgid "%s GROUP - %s"
+msgstr "%s GRUPPO - %s"
+
+#. %1$s: TMPL_VAR name=itemtype 
+#. %2$s: TMPL_VAR name=duration 
+#. %3$s: TMPL_VAR name=total 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:7 
+#, c-format
+msgid "%s acquired in the last <i>%s</i> days. %s results found"
+msgstr "%s acquisito negli ultimi <i>%s</i> giorni. Trovati %s risultati"
+
+#. %1$s: TMPL_VAR name=CGIitemtype 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:40 
+#, c-format
+msgid "%s acquired recently (the most recent being first)"
+msgstr "%s recentemente acquisiti (in ordine inverso di acquisizione)"
+
+#. %1$s: TMPL_VAR name=numberlength 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:71 
+#, c-format
+msgid "%s issues"
+msgstr "%s prestiti"
+
+#. %1$s: TMPL_VAR name=shelfbookcount 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:132 
+#, c-format
+msgid "%s item(s)"
+msgstr "%s elementi/volumi"
+
+#. %1$s: TMPL_VAR name=monthlength 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:73 
+#, c-format
+msgid "%s months"
+msgstr "%s mesi"
+
+#. %1$s: TMPL_VAR name=weeklength 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:72 
+#, c-format
+msgid "%s weeks"
+msgstr "%s settimane"
+
+#. %1$s: TMPL_VAR name=author 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:3 
+#, c-format
+msgid "%s,"
+msgstr "%s,"
+
+#. For the first occurrence, 
+#. %1$s: TMPL_VAR name=streetaddress 
+#. %2$s: TMPL_VAR name=city 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:8 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detailprint.tmpl:39 
+#, c-format
+msgid "%s, %s"
+msgstr "%s, %s"
+
+#. %1$s: TMPL_VAR name=btitle 
+#. %2$s: TMPL_VAR name=branch 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:42 
+#, c-format
+msgid "%s, pick up at: <b>%s</b>"
+msgstr "%s, ritirare a: <b>%s</b>"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:29
+msgid "&copy;"
+msgstr "©"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:105
+msgid "&lt;&lt;&lt;Previous"
+msgstr "<<Precedente"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:17 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:127
+msgid "&lt;&lt;Previous"
+msgstr "<<Precedente"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:34
+msgid "&nbsp; No results found."
+msgstr "  Nessun risultato trovato."
+
+#. For the first occurrence, 
+#. %1$s: TMPL_VAR name=itemcallnumber 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:86 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:115 
+#, c-format
+msgid "(%s)"
+msgstr "(%s)"
+
+#. %1$s: TMPL_VAR name=date_due 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:83 
+#, c-format
+msgid "(On Loan until %s)"
+msgstr "(In prestito fino a %s)"
+
+#. %1$s: TMPL_VAR name=timestamp 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:73 
+#, c-format
+msgid "(modified on %s)"
+msgstr "(modificato in data %s)"
+
+#. For the first occurrence, 
+#. %1$s: TMPL_VAR name=publicationyear 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:67 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:68 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:70 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:78 
+#, c-format
+msgid "- %s"
+msgstr "- %s"
+
+#. %1$s: TMPL_VAR name=marcsubjct 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:90 
+#, c-format
+msgid "- <a1> %s </a>"
+msgstr "- <a1>%s</a>"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:28
+msgid "2 months"
+msgstr "2 mesi"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:37
+msgid "2 quarters"
+msgstr "2 trimestri"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:19
+msgid "2 weeks"
+msgstr "2 settimane"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:43
+msgid "2 years"
+msgstr "2 anni"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:31
+msgid "3 months"
+msgstr "1 trimestre"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:22
+msgid "3 weeks"
+msgstr "3 settimane"
+
+#. %1$s: TMPL_VAR name=notes 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:71 
+#, c-format
+msgid ": %s"
+msgstr ": %s"
+
+#. For the first occurrence, 
+#. %1$s: TMPL_VAR name=place 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:69 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:72 
+#, c-format
+msgid "; %s"
+msgstr "; %s"
+
+#. %1$s: TMPL_VAR name=loggedinusername 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:59 
+#, c-format
+msgid "<a1> %s home </a> <a2> Log Out </a>"
+msgstr "<a1>%s abitazione</a><a2>Logout</a>"
+
+#. %1$s: TMPL_VAR name=dateaccessioned 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:77 
+#, c-format
+msgid "<a1> Accession</a> Date:%s"
+msgstr "<a1>Ultimo accesso</a> in data: %s"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-MARCdetail.tmpl:3 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:5 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-ISBDdetail.tmpl:4 
+#, c-format
+msgid "<a1> Simple </a> <a2> Complete </a> <a3> ISBD </a> <a4> Add to shelf </a> <a5> Print </a>"
+msgstr "<a1>Semplice</a><a2>Completo</a><a3>ISBD</a><a4>Aggiungi allo scaffale</a><a5>Stampa</a>"
+
+#. %1$s: TMPL_VAR name=shelfname 
+#. %2$s: TMPL_VAR name=shelfbookcount 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:70 
+#, c-format
+msgid "<a1>%s</a> (%s item(s))"
+msgstr "<a1>%s</a> (%s elemento/i)"
+
+#. %1$s: TMPL_VAR name=subject 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:59 
+#, c-format
+msgid "<a1>%s</a>,"
+msgstr "<a1>%s</a>,"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-bottom.inc:9 
+#, c-format
+msgid "<a1>Log In</a> to Koha"
+msgstr "<a1>Entra</a> in Koha"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:71 
+#, c-format
+msgid "<a1>Log in to Koha</a> to have personal options."
+msgstr "<a1>Entra in Koha</a> per abilitare le opzioni personali."
+
+#. %1$s: TMPL_VAR name=surname 
+#. %2$s: TMPL_VAR name=firstname 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:136 
+#, c-format
+msgid "<a1>Modify</a> %s%s"
+msgstr "<a1>Modifica</a> %s %s"
+
+#. %1$s: TMPL_VAR name=issues 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:81 
+#, c-format
+msgid "<b><a1>Total Issues:</a></b> %s"
+msgstr "<a><a1>Prestiti Totali:</a></b>"
+
+#. %1$s: TMPL_VAR name=additional 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:50 
+#, c-format
+msgid "<b>Additional Author:</b>%s"
+msgstr "<b>Autore supplementare:</b> %s"
+
+#. %1$s: TMPL_VAR name=additional 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:31 
+#, c-format
+msgid "<b>Additional authors:</b>%s"
+msgstr "<b>Autori supplementari:</b> %s"
+
+#. For the first occurrence, 
+#. %1$s: TMPL_VAR name=author 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:49 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:30 
+#, c-format
+msgid "<b>Author:</b> %s"
+msgstr "<b>Autore:</b> %s"
+
+#. %1$s: TMPL_VAR name=biblionumber 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:85 
+#, c-format
+msgid "<b>Biblio number:</b> %s"
+msgstr "<b>Numero scheda:</b> %s"
+
+#. %1$s: TMPL_VAR name=biblionumber 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:26 
+#, c-format
+msgid "<b>Biblionumber:</b> %s"
+msgstr "<b>Numero scheda:</b> %s"
+
+#. For the first occurrence, 
+#. %1$s: TMPL_VAR name=classification 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:43 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detailprint.tmpl:25 
+#, c-format
+msgid "<b>Classification:</b> %s"
+msgstr "<b>Classificazione:</b> %s"
+
+#. %1$s: TMPL_VAR name=classification 
+#. %2$s: TMPL_VAR name=dewey 
+#. %3$s: TMPL_VAR name=subclass 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:31 
+#, c-format
+msgid "<b>Classification:</b> %s%s%s"
+msgstr "<b>Classificazione:</b> %s%s%s"
+
+#. For the first occurrence, 
+#. %1$s: TMPL_VAR name=seriestitle 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:36 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detailprint.tmpl:19 
+#, c-format
+msgid "<b>Collection:</b> %s"
+msgstr "<b>Collezione:</b> %s"
+
+#. %1$s: TMPL_VAR name=copyrightdate 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:38 
+#, c-format
+msgid "<b>Copyright year:</b> %s"
+msgstr "<b>Anno di pubblicazione:</b> %s"
+
+#. %1$s: TMPL_VAR name=holdingbranch 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:71 
+#, c-format
+msgid "<b>Current Branch:</b> %s"
+msgstr "<b>Attuale sezione di appartenenza:</b> %s"
+
+#. %1$s: TMPL_VAR name=publicationyear 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:35 
+#, c-format
+msgid "<b>Date:</b> %s"
+msgstr "<b>Data:</b> %s"
+
+#. %1$s: TMPL_VAR name=dewey 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detailprint.tmpl:24 
+#, c-format
+msgid "<b>Dewey:</b> <a1>%s</a>"
+msgstr "<b>Codice Dewey:</b> <a1>%s</a>"
+
+#. %1$s: TMPL_VAR name=dewey 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:42 
+#, c-format
+msgid "<b>Dewey:</b>%s"
+msgstr "<b>Codice Dewey:</b>%s"
+
+#. %1$s: TMPL_VAR name=biblioitemnumber 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:84 
+#, c-format
+msgid "<b>Group Number:</b> %s"
+msgstr "<b>Gruppo Numero:</b> %s"
+
+#. %1$s: TMPL_VAR name=homebranch 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:65 
+#, c-format
+msgid "<b>Home Branch:</b> %s"
+msgstr "<b>Sezione di appartenenza:</b> %s"
+
+#. %1$s: TMPL_VAR name=isbn 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:32 
+#, c-format
+msgid "<b>ISBN:</b> %s"
+msgstr "<b>ISBN:</b> %s"
+
+#. For the first occurrence, 
+#. %1$s: TMPL_VAR name=ISBN 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:28 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detailprint.tmpl:28 
+#, c-format
+msgid "<b>ISBN:</b>%s"
+msgstr "<b>ISBN:</b>%s"
+
+#. %1$s: TMPL_VAR name=illus 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:38 
+#, c-format
+msgid "<b>Illus:</b> %s"
+msgstr "<b>Illustrazioni:</b> %s"
+
+#. %1$s: TMPL_VAR name=itemtype 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:27 
+#, c-format
+msgid "<b>Item Type:</b> %s"
+msgstr "<b>Tipo volume:</b> %s"
+
+#. %1$s: TMPL_VAR name=itemlost 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:73 
+#, c-format
+msgid "<b>Item lost:</b> %s"
+msgstr "<b>Volume disperso:</b> %s"
+
+#. %1$s: TMPL_VAR name=itemtype 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:66 
+#, c-format
+msgid "<b>Item type : </b>%s"
+msgstr "<b>Tipo di volume:</b> %s"
+
+#. For the first occurrence, 
+#. %1$s: TMPL_VAR name=lccn 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:44 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detailprint.tmpl:26 
+#, c-format
+msgid "<b>LCCN:</b> %s"
+msgstr "<b>LCCN:</b> %s"
+
+#. %1$s: TMPL_VAR name=card0 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:69 
+#, c-format
+msgid "<b>Last Borrower 1:</b> %s"
+msgstr "<b>Prestato ultimamente a (1):</b> %s"
+
+#. %1$s: TMPL_VAR name=card1 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:70 
+#, c-format
+msgid "<b>Last Borrower 2:</b> %s"
+msgstr "<b>Prestato ultimamente a (2):</b> %s"
+
+#. %1$s: TMPL_VAR name=timestamp0 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:67 
+#, c-format
+msgid "<b>Last borrowed:</b> %s"
+msgstr "<b>Prestato ultimamente a:</b> %s"
+
+#. %1$s: TMPL_VAR name=datelastseen 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:66 
+#, c-format
+msgid "<b>Last seen:</b> %s"
+msgstr "<b>Ultimamente visto al banco in data:</b> %s"
+
+#. %1$s: TMPL_VAR name=loanlength 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:29 
+#, c-format
+msgid "<b>Loan Length:</b> %s"
+msgstr "<b>Durata del prestito:</b> %s"
+
+#. %1$s: TMPL_VAR name=count 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:41 
+#, c-format
+msgid "<b>No. of Items:</b> %s"
+msgstr "<b>N. di volumi:</b> %s"
+
+#. For the first occurrence, 
+#. %1$s: TMPL_VAR name=bnotes 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:40 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:75 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:39 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detailprint.tmpl:22 
+#, c-format
+msgid "<b>Notes:</b> %s"
+msgstr "<b>Note:</b> %s"
+
+#. %1$s: TMPL_VAR name=pages 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:37 
+#, c-format
+msgid "<b>Pages:</b> %s"
+msgstr "<b>Pagine:</b> %s"
+
+#. %1$s: TMPL_VAR name=paidfor 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:74 
+#, c-format
+msgid "<b>Paid for:</b> %s"
+msgstr "<b>Costo (all'acquisto):</b> %s"
+
+#. %1$s: TMPL_VAR name=place 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:34 
+#, c-format
+msgid "<b>Place:</b> %s"
+msgstr "<b>Luogo di pubblicazione:</b> %s"
+
+#. %1$s: TMPL_VAR name=publishercode 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detailprint.tmpl:15 
+#, c-format
+msgid "<b>Published by :</b>%s"
+msgstr "<b>Pubblicato da:</b>%s"
+
+#. %1$s: TMPL_VAR name=publishercode 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:33 
+#, c-format
+msgid "<b>Publisher:</b> %s"
+msgstr "<b>Casa editrice:</b> %s"
+
+#. %1$s: TMPL_VAR name=renewals 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:76 
+#, c-format
+msgid "<b>Renewals:</b> %s"
+msgstr "<b>Rinnovi:</b> %s"
+
+#. %1$s: TMPL_VAR name=rentalcharge 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:30 
+#, c-format
+msgid "<b>Rental Charge:</b> %s"
+msgstr "<b>Tassa per il prestito:</b> %s"
+
+#. %1$s: TMPL_VAR name=replacementprice 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:72 
+#, c-format
+msgid "<b>Replacement Price:</b> %s"
+msgstr "<b>Costo di sostituzione:</b> %s"
+
+#. %1$s: TMPL_VAR name=serial 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:41 
+#, c-format
+msgid "<b>Serial:</b>%s"
+msgstr "<b>Serie:</b>%s"
+
+#. %1$s: TMPL_VAR name=size 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:39 
+#, c-format
+msgid "<b>Size:</b> %s"
+msgstr "<b>Dimensioni:</b> %s"
+
+#. For the first occurrence, 
+#. %1$s: TMPL_VAR name=subject 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:37 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detailprint.tmpl:20 
+#, c-format
+msgid "<b>Subject:</b> %s"
+msgstr "<b>Argomento:</b> %s"
+
+#. %1$s: TMPL_VAR name=count 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:67 
+#, c-format
+msgid "<b>Total Number of Items:</b> %s"
+msgstr "<b>Numero totale di volumi:</b> %s"
+
+#. For the first occurrence, 
+#. %1$s: TMPL_VAR name=url 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:28 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:45 
+#, c-format
+msgid "<b>URL:</b> %s"
+msgstr "<b>URL:</b> %s"
+
+#. For the first occurrence, 
+#. %1$s: TMPL_VAR name=url 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:65 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detailprint.tmpl:27 
+#, c-format
+msgid "<b>URL:</b> <a1>%s</a>"
+msgstr "<b>URL:</b> <a1>%s</a>"
+
+#. %1$s: TMPL_VAR name=unititle 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:40 
+#, c-format
+msgid "<b>Uniform title:</b> %s"
+msgstr "<b>Titolo uniforme:</b> %s"
+
+#. %1$s: TMPL_VAR name=unititle 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detailprint.tmpl:23 
+#, c-format
+msgid "<b>Unititle:</b> %s"
+msgstr "<b>Titolo uniforme:</b> %s"
+
+#. %1$s: TMPL_VAR name=volumeddesc 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:36 
+#, c-format
+msgid "<b>Volume:</b> %s"
+msgstr "<b>Volume:</b> %s"
+
+#. %1$s: TMPL_VAR name=copyrightdate 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detailprint.tmpl:21 
+#, c-format
+msgid "<b>Year :</b> %s"
+msgstr "<b>Anno:</b> %s"
+
+#. For the first occurrence, 
+#. %1$s: TMPL_VAR name=publicationyear 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:33 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detailprint.tmpl:16 
+#, c-format
+msgid "<b>in </b>%s"
+msgstr "<b>in </b>%s"
+
+#. %1$s: TMPL_VAR name=publishercode 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:32 
+#, c-format
+msgid "<b>published by :</b>%s"
+msgstr "<b>pubblicato da:</b> %s"
+
+#. %1$s: TMPL_VAR name=subtitle 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:29 
+#, c-format
+msgid "<b>subtitle:</b>%s"
+msgstr "<b>sottotitolo:</b> %s"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:94 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:179
+msgid "A free can be managed by any user."
+msgstr "Un campo libero può essere gestito da parte di qualsiasi utente."
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:93 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:178
+msgid "A public can be seen by everybody, but managed only by you."
+msgstr "Un campo pubblico può essere visto da tutti, ma gestito solamente da te."
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:147
+msgid "A search is done on every words you enter. Empty words are ignored. If you enter, for example \"the two towers\" in the title, the result list will contain all the books containing two AND tower in the title. The \"the\" will be discarded."
+msgstr "Verrà effettuata una ricerca su ogni parola immessa. Le stringhe vuote verranno ignorate. Selezionando, ad esempio, \"the two towers\" nel campo \"titolo\", la lista dei risultati conterrà tutti i volumi contenenti \"two\" e \"tower\" nel titolo. La stringa \"the\" verrà ignorata."
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:62 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:64
+msgid "Accepted"
+msgstr "Accettato."
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:118
+msgid "Accepted, will be ordered soon"
+msgstr "Accettato: verrà ordinato presto."
+
+#. %1$s: TMPL_VAR name=firstname 
+#. %2$s: TMPL_VAR name=surname 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-account.tmpl:5 
+#, c-format
+msgid "Account for %s %s"
+msgstr "Conto per %s %s"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:133
+msgid "Acquisition date"
+msgstr "Data di acquisto"
+
+#. INPUT type=submit 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:41
+msgid "Add Checked Items to Biblio Basket"
+msgstr "Aggiungi i volumi selezionati al cestino"
+
+#. INPUT type=submit 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:97
+msgid "Add New Shelf"
+msgstr "Aggiungi un nuovo scaffale"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:82
+msgid "Add Shelf"
+msgstr "Aggiungi scaffale"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:38
+msgid "Add a book by barcode"
+msgstr "Aggiungi un libro per codice a barre"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl:3
+msgid "Add book to bookshelf"
+msgstr "Aggiungi un libro allo scaffale"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:145
+msgid "Add or Remove Book Shelves"
+msgstr "Aggiungi o rimuovi scaffali"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-MARCdetail.tmpl:28 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:30 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-ISBDdetail.tmpl:29
+msgid "Add to basket"
+msgstr "Aggiungi al cestino"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl:8 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl:20
+msgid "Add to virtual shelf"
+msgstr "Aggiungi allo scaffale virtuale"
+
+#. %1$s: TMPL_VAR name=additional 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:20 
+#, c-format
+msgid "Additional authors: %s"
+msgstr "Autori supplementari: %s"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:33
+msgid "Advanced Search, More Options"
+msgstr "Ricerca avanzata, maggiori opzioni"
+
+#. A 
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:39 
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:39
+msgid "Advanced search"
+msgstr "Ricerca avanzata"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-account.tmpl:10
+msgid "Amount"
+msgstr "Ammontare"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/kohaerror.tmpl:8
+msgid "An Error has Occurred"
+msgstr "Si è verificato un errore"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:55
+msgid "Any"
+msgstr "Qualsiasi"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:13
+msgid "Any word"
+msgstr "Qualsiasi parola"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:86
+msgid "Anybody"
+msgstr "Chiunque"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:5
+msgid "Are our records correct?"
+msgstr "I dati registrati sono corretti?"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:57 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:59 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:117
+msgid "Asked"
+msgstr "Richiesto"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:29 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:129 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:141 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:10 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:28 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:14 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:54 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:84 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl:5
+msgid "Author"
+msgstr "Autore"
+
+#. %1$s: TMPL_VAR name=author 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:19 
+#, c-format
+msgid "Author: %s"
+msgstr "Autore: %s"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:126 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:77 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:79
+msgid "Available"
+msgstr "Disponibile"
+
+#. %1$s: TMPL_VAR name=barcode 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:51 
+#, c-format
+msgid "BARCODE %s"
+msgstr "CODICE A BARRE %s"
+
+#. %1$s: TMPL_VAR name=biblionumber 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detailprint.tmpl:7 
+#, c-format
+msgid "BIBLIO RECORD %s"
+msgstr "SCHEDA BIBLIOGRAFICA %s"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:5
+msgid "Back to biblio"
+msgstr "Ritorna alla scheda bibliografica"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:57
+msgid "Barcode"
+msgstr "Codice a barre"
+
+#. SCRIPT 
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:28
+msgid "Basket is empty"
+msgstr "Il cestino è vuoto"
+
+#. SCRIPT 
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:28
+msgid "Biblio added to the basket"
+msgstr "Aggiunta scheda bibliografica al cestino"
+
+#. A 
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:43 
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:43
+msgid "Biblio basket"
+msgstr "Cestino schede bibliografiche"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:51
+msgid "Bookshelves"
+msgstr "Scaffali"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:60
+msgid "Branch"
+msgstr "Sezione"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:144
+msgid "Branches"
+msgstr "Sezioni"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:82
+msgid "Call Number"
+msgstr "Collocazione"
+
+#. %1$s: TMPL_VAR name=wthdrawn 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:80 
+#, c-format
+msgid "Cancelled: %s"
+msgstr "Annullato: %s"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:37
+msgid "Cannot be Reserved"
+msgstr "Non è possibile la prenotazione"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-auth.tmpl:28
+msgid "Cardnumber"
+msgstr "Numero di tesserino"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:4
+msgid "Catalogue search"
+msgstr "Ricerca nel catalogo"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:85 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:109 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:158
+msgid "Category"
+msgstr "Categoria"
+
+#. INPUT type=submit 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:79
+msgid "Change Language"
+msgstr "Seleziona lingua"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:58
+msgid "Charges"
+msgstr "Addebiti"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-userupdate.tmpl:14
+msgid "City"
+msgstr "Località"
+
+#. %1$s: TMPL_VAR name=classification 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:29 
+#, c-format
+msgid "Classification: %s"
+msgstr "Classificazione: %s"
+
+#. INPUT type=reset 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:41
+msgid "Clear All"
+msgstr "Cancella tutti"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-basket-menu.inc:12 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasketform.tmpl:21
+msgid "Close"
+msgstr "Chiudi"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:56
+msgid "Collection:"
+msgstr "Collezione:"
+
+#. %1$s: TMPL_VAR name=seriestitle 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:22 
+#, c-format
+msgid "Collection: %s"
+msgstr "Collezione: %s"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:110
+msgid "Content size"
+msgstr "Dimensioni contenuto"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:30
+msgid "Copies"
+msgstr "Copie"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:11
+msgid "Copyright date"
+msgstr "Data di pubblicazione"
+
+#. %1$s: TMPL_VAR name=copyrightdate 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:24 
+#, c-format
+msgid "Copyright year: %s"
+msgstr "Data di pubblicazione: %s"
+
+#. INPUT type=submit 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:136
+msgid "Delete"
+msgstr "Cancella"
+
+#. INPUT type=submit 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:75
+msgid "Delete Shelves"
+msgstr "Cancella scaffali"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:74
+msgid "Detailed notes:"
+msgstr "Dettagli:"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:130
+msgid "Dewey"
+msgstr "Dewey:"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:64
+msgid "Dewey:"
+msgstr "Dewey:"
+
+#. %1$s: TMPL_VAR name=dewey 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:28 
+#, c-format
+msgid "Dewey: %s"
+msgstr "Dewey: %s"
+
+#. SCRIPT 
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-basket-top.inc:18
+msgid "Do you want to empty the basket ?"
+msgstr "Vuoi svuotare il cestino?"
+
+#. SCRIPT 
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-basket-top.inc:18
+msgid "Do you want to remove selected biblios ?"
+msgstr "Vuoi cancellare le schede selezionate?"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:55
+msgid "Due date"
+msgstr "Data attesa per la restituzione"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasketform.tmpl:14
+msgid "E-mail address"
+msgstr "Indirizzo e-mail"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-userupdate.tmpl:17
+msgid "Email"
+msgstr "E-mail"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-basket-menu.inc:4
+msgid "Empty"
+msgstr "Svuotare"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:4 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:151
+msgid "Enter a new suggestion"
+msgstr "Sottometti una nuova proposta"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:5
+msgid "Fill this form to suggest the library a new acquisition. You will be mailed when the library treats you suggestion"
+msgstr "Riempi questo modulo per proporre un nuovo acquisto per la biblioteca. Verrai contattato quando la biblioteca prenderà in considerazione la tua proposta."
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:39
+msgid "Filter on"
+msgstr "Filtro attivo"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-account.tmpl:9
+msgid "Fines & charges"
+msgstr "Multe e addebiti"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-userupdate.tmpl:12
+msgid "First name"
+msgstr "Nome"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:89 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:128 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:171 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:173 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl:17
+msgid "Free"
+msgstr "Gratis"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:61
+msgid "Friday"
+msgstr "Venerdì"
+
+#. %1$s: TMPL_VAR name=email_sender 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:6 
+#, c-format
+msgid "Hi, Here is the biblio basket sent by %s"
+msgstr "Salve, ecco il cestino inviato da %s"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:138
+msgid "Hints"
+msgstr "Suggerimenti"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:37
+msgid "Home"
+msgstr "Pagina principale"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-userupdate.tmpl:15
+msgid "Home phone"
+msgstr "Telefono abitazione"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:90
+msgid "ISBN"
+msgstr "ISBN"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:16
+msgid "ISBN/ISSN"
+msgstr "ISBN/ISSN"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:55
+msgid "ISBN:"
+msgstr "ISBN:"
+
+#. %1$s: TMPL_VAR name=ISBN 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:17 
+#, c-format
+msgid "ISBN: %s"
+msgstr "ISBN: %s"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:148
+msgid "If you want to enter a partial word, add a * or a % at the end of the word. For example \"two tower*\" will retrieve \"the two towers\", \"two white towers\", \"a tower and two cities\""
+msgstr "Se desideri specificare l'inizio di una parola, aggiungi un * o un % alla fine della parola. Ad esempio \"due torri*\" cercherà \"le due torri\", \"due torri bianche\", \"una torre e due città\""
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:5
+msgid "Impossible to set reserve because"
+msgstr "Non è possibile la prenotazione perché"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-MARCdetail.tmpl:25 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:27 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-ISBDdetail.tmpl:26
+msgid "Issues"
+msgstr "Prestiti"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:4
+msgid "Issues for a subscription"
+msgstr "Prestiti per un abbonamento"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:79
+msgid "Issues summary"
+msgstr "Riassunto prestiti"
+
+#. %1$s: TMPL_VAR name=startdate 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:10 
+#, c-format
+msgid "It began on <b>%s</b> and is issued every <b>"
+msgstr "Cominciato il <b>%s</b> ed esce ogni <b>"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:105
+msgid "Item"
+msgstr "Volume"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:45
+msgid "Item Count"
+msgstr "Numero volumi"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:29 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:52
+msgid "Item Type"
+msgstr "Tipo di volume"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:74
+msgid "Item barcode"
+msgstr "Codice a barre del volume"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-MARCdetail.tmpl:236
+msgid "Items"
+msgstr "Volumi"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:56
+msgid "Itemtype"
+msgstr "Tipo di volumi"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-auth.tmpl:27
+msgid "Koha Login"
+msgstr "Koha Login"
+
+#. A 
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:37
+msgid "Koha home page"
+msgstr "Pagina principale di Koha"
+
+#. %1$s: TMPL_VAR name=lccn 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:30 
+#, c-format
+msgid "LCCN: %s"
+msgstr "LCCN: %s"
+
+#. %1$s: TMPL_VAR name=cardnumber 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:6 
+#, c-format
+msgid "Library Card: %s"
+msgstr "Tesserino biblioteca: %s"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:46
+msgid "Location"
+msgstr "Collocazione"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-bottom.inc:5
+msgid "Log Out"
+msgstr "Logout"
+
+#. %1$s: TMPL_VAR name=loggedinusername 
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-bottom.inc:4 
+#, c-format
+msgid "Logged in as <b>%s</b> <a1>Members Home</a>"
+msgstr "Logged in come <b>%s</b> <a1>Pagina utente</a>"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:33
+msgid "Managed by"
+msgstr "Gestito da"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:85
+msgid "Me"
+msgstr "Io"
+
+#. A 
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:41
+msgid "Member Home page"
+msgstr "Pagina principale dell'utente"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-userupdate.tmpl:4
+msgid "Member information change"
+msgstr "Cambiare le informazioni dell'utente"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:67
+msgid "Message from the library"
+msgstr "Messaggio dalla biblioteca"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:111
+msgid "Modify"
+msgstr "Modifica"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:154
+msgid "Modify shelf"
+msgstr "Modifica scaffale"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:49
+msgid "Monday"
+msgstr "Lunedí"
+
+#. %1$s: TMPL_VAR name=biblionumber 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:3 
+#, c-format
+msgid "N&#176;%s)"
+msgstr "N°%s)"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:83 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:156
+msgid "Name"
+msgstr "Nome"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:25 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:135
+msgid "Next &gt;&gt;"
+msgstr "Successivo >>"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:112
+msgid "Next &gt;&gt;&gt;"
+msgstr "Successivo >>>"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:68 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:69
+msgid "No"
+msgstr "No"
+
+#. For the first occurrence, 
+#. SCRIPT 
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-basket-top.inc:18 
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:28
+msgid "No biblio added"
+msgstr "Nessuna scheda bibliografica aggiunta"
+
+#. For the first occurrence, 
+#. SCRIPT 
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-basket-top.inc:18 
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:28
+msgid "No biblio selected"
+msgstr "Nessuna scheda bibliografica selezionata"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:6
+msgid "No fields are mandatory. Fill whatever you know. The \"Note\" field can be used for whatever you want"
+msgstr "Nessun campo è obbligatorio. Riempi solo quelli noti. Il campo \"Nota\" può essere usato per quel che si vuole."
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:96
+msgid "Not Reservable"
+msgstr "Non prenotabile"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:17 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:34
+msgid "Note"
+msgstr "Nota"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:153
+msgid "Note : if you ask suggestion done by anybody, the result will contain only new suggestions. Suggestions treated by a librarian will not be shown."
+msgstr "Nota: se si richiede una proposta effettuata da qualcuno, il risultato conterrà nuove proposte. Non verranno mostrate proposte già prese in considerazione dal bibliotecario."
+
+#. %1$s: TMPL_VAR name=fee 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:72 
+#, c-format
+msgid "Note there will be a reserve charge of <b>$%s</b>"
+msgstr "Si noti che è prevista una cauzione di <b>$%s</b>"
+
+#. %1$s: TMPL_VAR name=notes 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:25 
+#, c-format
+msgid "Notes : %s"
+msgstr "Note: %s"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:62
+msgid "Notes:"
+msgstr "Note:"
+
+#. INPUT type=submit 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:30 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:48
+msgid "OK"
+msgstr "OK"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-basket-top.inc:6
+msgid "OPAC Basket"
+msgstr "Cestino OPAC"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:125
+msgid "Online"
+msgstr "Online"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:67 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:69
+msgid "Ordered"
+msgstr "Ordinato"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:126
+msgid "Ordered by"
+msgstr "Ordinato da"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:119
+msgid "Ordered by the library"
+msgstr "Ordinato dalla biblioteca"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:51 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:72
+msgid "Other options"
+msgstr "Altre opzioni"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:84 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:157
+msgid "Owner"
+msgstr "Proprietario"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:146
+msgid "Partial search"
+msgstr "Ricerca parziale"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-auth.tmpl:29
+msgid "Password"
+msgstr "Password"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:41
+msgid "Personal page"
+msgstr "Pagina personale"
+
+#. INPUT type=submit 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:74
+msgid "Place Reserve"
+msgstr "Effettua la prenotazione"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-userupdate.tmpl:5
+msgid "Please change what's needed. An email will be sent to the library."
+msgstr "Cambiare ciò che si ritiene necessario. Verrà inviato un e-mail alla biblioteca."
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:52
+msgid "Please confirm that you wish to request an item of these types:"
+msgstr "Confermare che si desidera richiedere un volume di questi tipi:"
+
+#. %1$s: TMPL_VAR name=CGIbranch 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:44 
+#, c-format
+msgid "Please select the branch from which you want to collect the item: %s"
+msgstr "Selezionare la sezione dalla quale si desidera ricevere il volume: %s"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:21
+msgid "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."
+msgstr "Selezionare quali volumi siano OK. Ne sarà riservato uno non appena si renderà disponibile."
+
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-basket-menu.inc:10
+msgid "Print"
+msgstr "Stampa"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:87 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:122 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:161 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:163 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl:15
+msgid "Private"
+msgstr "Privato"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasketform.tmpl:9
+msgid "Problem sending the basket..."
+msgstr "Problema nell'invio del cestino..."
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:88 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:125 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:166 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:168 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl:16
+msgid "Public"
+msgstr "Pubblico"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:131
+msgid "Publication Year"
+msgstr "Anno di pubblicazione"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:15
+msgid "Publication place"
+msgstr "Luogo di pubblicazione"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:14
+msgid "Publication year"
+msgstr "Anno di pubblicazione"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:106
+msgid "Published between"
+msgstr "Pubblicato tra"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:51
+msgid "Published by :"
+msgstr "Pubblicato da:"
+
+#. %1$s: TMPL_VAR name=publishercode 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:21 
+#, c-format
+msgid "Published by: %s"
+msgstr "Pubblicato da: %s"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:98 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:132 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:12 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:30
+msgid "Publisher"
+msgstr "Casa editrice"
+
+#. %1$S: type=text name=value 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:30 
+#, c-format
+msgid "Quick search : %S"
+msgstr "Ricerca rapida: %S"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:121
+msgid "Received by the library"
+msgstr "Ricevuto dalla biblioteca"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:37
+msgid "Recent acquisitions"
+msgstr "Acquisti recenti"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:72 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:74
+msgid "Rejected"
+msgstr "Respinto"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:86
+msgid "Related links:"
+msgstr "Links correlati:"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:143
+msgid "Remember that a title can concern a physical author (Victor Hugo) or a company, group, collective author (CNRS, Library of Congress)"
+msgstr "Si ricorda che un titolo può essere relativo ad un effettivo autore (Victor Hugo), o ad una collaborazione, gruppo, o collezione di autori (CNRS, Biblioteca del Congresso)"
+
+#. INPUT type=submit 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:29
+msgid "Remove Selected Items"
+msgstr "Eliminare i volumi selezionati"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-basket-menu.inc:6
+msgid "Remove selection"
+msgstr "Eliminare la selezione"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:59
+msgid "Renewable"
+msgstr "Rinnovabile"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-MARCdetail.tmpl:20 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:94 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:22 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:28 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-ISBDdetail.tmpl:21
+msgid "Request"
+msgstr "Richiesta"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:85
+msgid "Reserve date"
+msgstr "Data di prenotazione"
+
+#. %1$s: TMPL_VAR name=title 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:3 
+#, c-format
+msgid "Reserve page for <i>%s</i>"
+msgstr "Pagina della prenotazione per <i>%s</i>"
+
+#. %1$s: TMPL_VAR name=startfrom 
+#. %2$s: TMPL_VAR name=endat 
+#. %3$s: TMPL_VAR name=numrecords 
+#: ../../koha-tmpl/opac-tmpl/css/en/subject.tmpl:17 
+#, c-format
+msgid "Results %s through %s of %s records."
+msgstr "Risultati da %s a %s di %s elementi."
+
+#. For the first occurrence, 
+#. %1$s: TMPL_VAR name=from 
+#. %2$s: TMPL_VAR name=to 
+#. %3$s: TMPL_VAR name=total 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:31 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:121 
+#, c-format
+msgid "Results <b><i>%s</i> through <i>%s</i> of <i>%s</i></b>"
+msgstr "Risultati da <b><i>%s</i> a <i>%s</i> di <i>%s</i></b>"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:119
+msgid "Results per page :"
+msgstr "Risultati per pagina:"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:64
+msgid "Saturday"
+msgstr "Sabato"
+
+#. INPUT type=submit 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:45 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:182
+msgid "Save"
+msgstr "Salva"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:9
+msgid "Search on"
+msgstr "Cerca su"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:21
+msgid "Search the catalogue"
+msgstr "Cerca nel catalogo"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:61
+msgid "Select Shelves to Delete"
+msgstr "Seleziona gli scaffali da eliminare"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:145
+msgid "Select a branch if you want to limit your search to items in a specific branch. By default the search is done on every branches of the library"
+msgstr "Seleziona una sezione se desideri limitare la ricerca ad una sezione specifica. Di norma, la ricerca viene effettuata su tutte le sezioni della biblioteca."
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl:6
+msgid "Select bookshelf"
+msgstr "Seleziona lo scaffale"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-basket-menu.inc:8 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasketform.tmpl:15
+msgid "Send"
+msgstr "Invia"
+
+#. INPUT type=submit 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:18
+msgid "Send suggestion to the library staff"
+msgstr "Invia la proposta al personale della biblioteca"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasketform.tmpl:4
+msgid "Sending the basket"
+msgstr "Il cestino sta per essere inviato"
+
+#. A 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-MARCdetail.tmpl:24 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:26 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-ISBDdetail.tmpl:25
+msgid "Serial issues"
+msgstr "Prestiti di periodici"
+
+#. %1$s: TMPL_VAR name=serial 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:27 
+#, c-format
+msgid "Serial: %s"
+msgstr "Periodico: %s"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:44
+msgid "Series title"
+msgstr "Titolo del periodico"
+
+#. INPUT type=submit 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:93
+msgid "Set Filter"
+msgstr "Seleziona un filtro"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:8
+msgid "Shelf content"
+msgstr "Contenuto dello scaffale"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:31 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:105
+msgid "Shelf list"
+msgstr "Elenco degli scaffali"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:108
+msgid "Shelf name"
+msgstr "Nome dello scaffale"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-auth.tmpl:5
+msgid "Sorry, KOHA doesnt think you have permission for this page."
+msgstr "Spiacente, a KOHA non sembra che tu abbia permesso di accedere a questa pagina."
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:141
+msgid "Sorry, there were no results"
+msgstr "Spiacente, nessun risultato"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-auth.tmpl:10
+msgid "Sorry, your session has timed out, please login again."
+msgstr "Spiacente, la sessione è scaduta: occorre rieffettuare il login."
+
+#. INPUT type=submit 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:68
+msgid "Start search"
+msgstr "Inizia la ricerca"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:31
+msgid "Status"
+msgstr "Stato"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-account.tmpl:11
+msgid "Still owing"
+msgstr "Ancora in possesso"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-userupdate.tmpl:13
+msgid "Street address"
+msgstr "Indirizzo postale"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:36 
+#: ../../koha-tmpl/opac-tmpl/css/en/subject.tmpl:7
+msgid "Subject"
+msgstr "Argomento"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:57
+msgid "Subject(s):"
+msgstr "Argomento(i):"
+
+#. %1$s: TMPL_VAR name=subject 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:23 
+#, c-format
+msgid "Subject: %s"
+msgstr "Argomento: %s"
+
+#. INPUT type=submit 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:46 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-userupdate.tmpl:18
+msgid "Submit"
+msgstr "Invia"
+
+#. %1$s: TMPL_VAR name=bibliotitle 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:9 
+#, c-format
+msgid "Subscription information for %s"
+msgstr "Informazioni di abbonamento per %s"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:48
+msgid "Subtitle:"
+msgstr "Sottotitolo:"
+
+#. %1$s: TMPL_VAR name=subtitle 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:18 
+#, c-format
+msgid "Subtitle: %s"
+msgstr "Sottotitolo: %s"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:32
+msgid "Suggested by"
+msgstr "Proposto da"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:120
+msgid "Suggestion rejected : won't be buy"
+msgstr "La proposta è stata respinta: non verrà acquistato"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:23
+msgid "Suggestions"
+msgstr "Proposte"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:44
+msgid "Summary"
+msgstr "Dati generali"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:67
+msgid "Sunday"
+msgstr "Domenica"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-userupdate.tmpl:10
+msgid "Surname"
+msgstr "Cognome"
+
+#. %1$s: TMPL_VAR name=email_add 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasketform.tmpl:7 
+#, c-format
+msgid "The basket was sent to: %s"
+msgstr "Il cestino è stato inviato a: %s"
+
+#. %1$s: TMPL_VAR name=reservecount 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:20 
+#, c-format
+msgid "There are <b>%s</b> reserves already on this item."
+msgstr "Esistono già <b>%s</b> prenotazioni per questo volume."
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:82 
+#, c-format
+msgid "This Library is powered by <a1>Koha</a> free software ILS, and compliant with web standards <a2>"
+msgstr "La Biblioteca è potenziata da <a1>Koha</a>, un software libero ILS e conforme agli standard del web <a2>"
+
+#. SCRIPT 
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:28
+msgid "This biblio is already in the basket"
+msgstr "Questa scheda è già nel cestino"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:13
+msgid "This card has been declared lost. Reserve impossible. Please contact the library"
+msgstr "Questo tesserino è stato dichiarato disperso. Non è possibile effettuare la prenotazione. Si prega di contattare la Biblioteca."
+
+#. %1$s: TMPL_VAR name=subscriptionsnumber 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:134 
+#, c-format
+msgid "This is a serial subscription (we have %s subscriptions). You can see which <a1> Issues </a> we have and don't have"
+msgstr "<a1>uscite</a> siano disponibili.'>Questa è l'abbonamento ad un periodico (abbiamo %s abbonamenti). È possibile vedere quali <a1>uscite</a> siano disponibili."
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:58
+msgid "Thursday"
+msgstr "Giovedí"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:21 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:128 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:139 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:9 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:27 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-userupdate.tmpl:11 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:53 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:83 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl:4
+msgid "Title"
+msgstr "Titolo"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-account.tmpl:34
+msgid "Total Due"
+msgstr "Totale dovuto"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:145 
+#, c-format
+msgid "Try another <a1>Advanced search</a>"
+msgstr "<a1>Ricerca avanzata</a>'>Prova un'altra <a1>Ricerca avanzata</a>"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:52
+msgid "Tuesday"
+msgstr "Martedí"
+
+#. %1$s: TMPL_VAR name=url 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:31 
+#, c-format
+msgid "URL : %s"
+msgstr "URL: %s"
+
+#. %1$s: TMPL_VAR name=unititle 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:26 
+#, c-format
+msgid "Unified title: %s"
+msgstr "Titolo unificato: %s"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:63
+msgid "Unititle:"
+msgstr "Titolo unificato (Unititle): %s"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:12
+msgid "Update Record"
+msgstr "Aggiorna il campo"
+
+#. IMG 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:84
+msgid "Valid XHTML 1.0!"
+msgstr "Valid XHTML 1.0!"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:57
+msgid "View & manage suggestions"
+msgstr "Rivedi e gestisci le proposte"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:17 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:24 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:31
+msgid "View Accounts"
+msgstr "Vedi gli accounts"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:54
+msgid "Virtual shelves"
+msgstr "Scaffali virtuali"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:13
+msgid "Volume"
+msgstr "Volume"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:124
+msgid "Website"
+msgstr "Pagina web"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:55
+msgid "Wednesday"
+msgstr "Mercoledí"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:64
+msgid "Which is to be picked up from"
+msgstr "che verrà ritirato da"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-userupdate.tmpl:16
+msgid "Work/Fax phone"
+msgstr "Telefono/Fax ufficio"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:61
+msgid "Year :"
+msgstr "Anno:"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:68 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:69
+msgid "Yes"
+msgstr "Sí"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-auth.tmpl:15
+msgid "You are accessing koha from a different ip address! please login again."
+msgstr "Sei collegato a Koha da un indirizzo IP diverso! Si prega di effettuare nuovamente il login."
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:12
+msgid "You are gone without address. Reservation is forbidden. Please contact the library"
+msgstr "Risulti senza indirizzo. La prenotazione non è consentita. Si prega di contattare la biblioteca."
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:140
+msgid "You can enter a complete or a part of a title. The search will also be done in subtitles and other title related fields"
+msgstr "È possibile selezionare un titolo completo o parte di esso. La ricerca verrà effettuata anche tra i sottotitoli ed altri campi analoghi."
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:142
+msgid "You can enter a name or a surname. The search will also be done in additional authors and other author related fields (translator, illustrator...)"
+msgstr "È possibile selezionare un nome o un cognome. La ricerca verrà effettuata anche tra gli autori supplementari ed altri campi analoghi (traduttore, illustratore...)"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:9
+msgid "You did not specify any search criteria"
+msgstr "Non è stato specificato alcun criterio di ricerca."
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-auth.tmpl:20
+msgid "You entered an incorrect username or password, please try again."
+msgstr "Username o password errata. Si prega di riprovare."
+
+#. %1$s: TMPL_VAR name=issues_count 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:50 
+#, c-format
+msgid "You have <b>%s</b> items currently issued."
+msgstr "Hai attualmente <b>%s</b> volumi in prestito."
+
+#. %1$s: TMPL_VAR name=reserves_count 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:80 
+#, c-format
+msgid "You have <b>%s</b> items currently reserved."
+msgstr "Hai attualmente <b>%s</b> volumi prenotati."
+
+#. %1$s: TMPL_VAR name=amountoutstanding 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:30 
+#, c-format
+msgid "You have a credit of %s"
+msgstr "Disponi di un credito di %s"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:74
+msgid "You have no items on issue."
+msgstr "Non hai alcun volume in prestito."
+
+#. For the first occurrence, 
+#. %1$s: TMPL_VAR name=amountoutstanding 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:16 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:23 
+#, c-format
+msgid "You have outstanding charges and fines of %s"
+msgstr "Risultano debiti e multe per %s a tuo carico."
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:39
+msgid "You have reserved items waiting:"
+msgstr "I seguenti volumi prenotati sono in attesa:"
+
+#. %1$s: TMPL_VAR name=searchdesc 
+#. %2$s: TMPL_VAR name=total 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:4 
+#, c-format
+msgid "You searched on <b>%s</b>. %s results found"
+msgstr "È stata effettuata una ricerca con parametri <b>%s</b>. Trovati %s risultati."
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:14
+msgid "Your account is temporarily suspended. Please contact the library"
+msgstr "L'account è temporaneamente sospeso. Si prega di contattare la biblioteca."
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:2
+msgid "Your biblio basket"
+msgstr "Il tuo cestino schede bibliografiche."
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-userupdate.tmpl:6
+msgid "Your changes won't appear until the library has validated them."
+msgstr "I cambiamenti diventeranno effettivi non appena saranno convalidati dalla biblioteca."
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:92 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:177
+msgid "a private bookshelf is managed by you &amp; can be seen only by you."
+msgstr "Uno scaffale privato è gestito solo da te & può essere visto solo da te."
+
+#. SCRIPT 
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:28
+msgid "already in the basket"
+msgstr "già nel cestino"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:98
+msgid "back to shelf list"
+msgstr "indietro all'elenco degli scaffali"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:111 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:12
+msgid "barcode"
+msgstr "codice a barre"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:11
+msgid "basket.txt"
+msgstr "basket.txt"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:109
+msgid "date Due"
+msgstr "data restituzione"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:13
+msgid "day"
+msgstr "giorno"
+
+#. INPUT type=image name=delete 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:24 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:63 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:11
+msgid "delete"
+msgstr "rimuovi"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:70
+msgid "for"
+msgstr "per"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:52 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:21
+msgid "in"
+msgstr "in"
+
+#. IMG 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:16 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:16
+msgid "koha"
+msgstr "koha"
+
+#. IMG 
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:33
+msgid "koha logo"
+msgstr "logo koha"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:110
+msgid "last Seen"
+msgstr "visto ultimamente"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:108
+msgid "location"
+msgstr "collocazione"
+
+#. INPUT type=submit 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-auth.tmpl:33
+msgid "login"
+msgstr "login"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasketform.tmpl:13
+msgid "mail sent by"
+msgstr "messaggio inviato da"
+
+#. INPUT type=image name=submit 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:22 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:61
+msgid "modify"
+msgstr "modifica"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:25
+msgid "month"
+msgstr "mese"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:46
+msgid "on"
+msgstr "su"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:68
+msgid "on issue bit"
+msgstr "in prestito"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl:11
+msgid "or add to a new bookshelf"
+msgstr "o aggiungi ad un nuovo scaffale"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/popup-top.inc:5
+msgid "popup"
+msgstr "popup"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:34
+msgid "quarter"
+msgstr "trimestre"
+
+#. %1$s: TMPl_VAR name=startdate 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:75 
+#, c-format
+msgid "since <b>%s</b>"
+msgstr "a partire da <b>%s</b>"
+
+#. META http-equiv=Content-Type 
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/popup-top.inc:6
+msgid "text/html; charset=iso-8859-1"
+msgstr "text/html; charset=iso-8859-1"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:13
+msgid "title"
+msgstr "titolo"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:16
+msgid "week"
+msgstr "settimana"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:40
+msgid "year"
+msgstr "anno"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:9
+msgid "you already have a reserve placed on this item."
+msgstr "hai già una prenotazione per questo volume."
+
+#. %1$s: TMPL_VAR name=too_many_reserves 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:8 
+#, c-format
+msgid "you cannot make more than %s reserves."
+msgstr "non puoi effettuare piú di %s prenotazioni."
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:11
+msgid "you must select a branch for pickup!"
+msgstr "devi scegliere una sezione dove effettuare il ritiro!"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:10
+msgid "you must select at least on item type!"
+msgstr "devi selezionare almeno un tipo di volume!"
+
+#. %1$s: TMPL_VAR name=too_much_oweing 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:7 
+#, c-format
+msgid "you owe %s"
+msgstr "devi %s"
+
diff --git a/misc/translator/po/css_opac_zh_TW.po b/misc/translator/po/css_opac_zh_TW.po
index be8376668c..8dd276f3c5 100644
--- a/misc/translator/po/css_opac_zh_TW.po
+++ b/misc/translator/po/css_opac_zh_TW.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Koha OPAC 2.2cvs\n"
-"POT-Creation-Date: 2004-12-30 02:06-0500\n"
+"POT-Creation-Date: 2005-01-24 02:10-0500\n"
 "PO-Revision-Date: 2004-02-18 02:40-0500\n"
 "Last-Translator: Ambrose Li <acli@ada.dhs.org>\n"
 "Language-Team: Chinese <zh@li.org>\n"
@@ -18,9 +18,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. SCRIPT
-#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:24
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
 msgid " Biblio(s) added"
-msgstr ""
+msgstr "個書目成功新增"
+
+#. %1$S: type=text name=value
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:111
+#, c-format
+msgid "%S and"
+msgstr "%S 及"
 
 #. %1$s: TMPL_VAR name=firstname
 #. %2$s: TMPL_VAR name=surname
@@ -30,13 +36,6 @@ msgstr ""
 msgid "%s %s (%s)"
 msgstr "%s %s (%s)"
 
-#. %1$s: TMPL_VAR name=shelfname
-#. %2$s: TMPL_VAR name=shelfbookcount
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:90
-#, c-format
-msgid "%s (%s books)"
-msgstr "%s (%s本書)"
-
 #. %1$s: TMPL_VAR name=title
 #. %2$s: TMPL_VAR name=author
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:9
@@ -51,11 +50,9 @@ msgid "%s (hm)"
 msgstr "%s (住宅)"
 
 # TODO 要覆查譯文
-#. For the first occurrence,
 #. %1$s: TMPL_VAR name=title
 #. %2$s: TMPL_VAR name=biblionumber
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:37
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:23
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:43
 #, c-format
 msgid "%s (record %s)"
 msgstr "%s (第%s個記錄)"
@@ -86,32 +83,31 @@ msgstr "最近<b>%2$s</b>日內新到的%1$s。找到%3$s個結果"
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:41
 #, c-format
 msgid "%s acquired recently (the most recent being first)"
-msgstr ""
+msgstr "近日採購的%s（由最新至最舊）"
 
 #. %1$s: TMPL_VAR name=numberlength
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:70
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:71
 #, c-format
 msgid "%s issues"
-msgstr "%s期"
+msgstr "%s 期"
+
+#. %1$s: TMPL_VAR name=shelfbookcount
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:132
+#, c-format
+msgid "%s item(s)"
+msgstr "%s 項圖書資料"
 
 #. %1$s: TMPL_VAR name=monthlength
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:72
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:73
 #, c-format
 msgid "%s months"
-msgstr "%s個月"
+msgstr "%s 個月"
 
 #. %1$s: TMPL_VAR name=weeklength
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:71
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:72
 #, c-format
 msgid "%s weeks"
-msgstr "%s週"
-
-#. %1$s: TMPL_VAR name=shelfname
-#. %2$s: TMPL_VAR name=shelfbookcount
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:148
-#, c-format
-msgid "%s(%s books)"
-msgstr "%s(%s本書)"
+msgstr "%s 週"
 
 #. %1$s: TMPL_VAR name=author
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:3
@@ -155,8 +151,8 @@ msgstr "　什麼也找不到"
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=itemcallnumber
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:109
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:86
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:115
 #, c-format
 msgid "(%s)"
 msgstr "(%s)"
@@ -171,47 +167,47 @@ msgstr "(借出，直至%s)"
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:73
 #, c-format
 msgid "(modified on %s)"
-msgstr ""
+msgstr "（更新日期：%s）"
 
 #. For the first occurrence,
-#. %1$s: TMPL_VAR name=marcnote
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:72
+#. %1$s: TMPL_VAR name=publicationyear
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:67
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:68
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:70
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:78
 #, c-format
 msgid "- %s"
 msgstr "- %s"
 
 #. %1$s: TMPL_VAR name=marcsubjct
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:84
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:90
 #, c-format
 msgid "- <a1> %s </a>"
 msgstr "- <a1>%s</a>"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:27
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:28
 msgid "2 months"
-msgstr "雙月刊"
+msgstr "兩個月"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:36
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:37
 msgid "2 quarters"
-msgstr "雙季刊"
+msgstr "兩季"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:18
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:19
 msgid "2 weeks"
-msgstr "雙週刊"
+msgstr "兩週"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:42
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:43
 msgid "2 years"
-msgstr "雙年刊"
+msgstr "兩年"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:30
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:31
 msgid "3 months"
-msgstr "三月刊"
+msgstr "三個月"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:21
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:22
 msgid "3 weeks"
-msgstr "三週刊"
+msgstr "三週"
 
 #. %1$s: TMPL_VAR name=notes
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:71
@@ -231,7 +227,7 @@ msgstr "; %s"
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:60
 #, c-format
 msgid "<a1> %s home </a> <a2> Log Out </a>"
-msgstr "【<a1>%s之個人主頁</a>】【<a2>登出</a>】"
+msgstr "<a1>%s 之個人主頁</a>　<a2>登出</a>"
 
 #. %1$s: TMPL_VAR name=dateaccessioned
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:77
@@ -239,23 +235,26 @@ msgstr "【<a1>%s之個人主頁</a>】【<a2>登出</a>】"
 msgid "<a1> Accession</a> Date:%s"
 msgstr "<a1>登錄</a>日期：%s"
 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-ISBDdetail.tmpl:4
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-MARCdetail.tmpl:3
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:5
 #, c-format
-msgid "<a1> ISBD </a> <a2> MARC </a> <a3> Print </a>"
-msgstr ""
-
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-MARCdetail.tmpl:4
-#, c-format
-msgid "<a1> Normal </a> <a2> ISBD </a> <a3> Print </a>"
+msgid ""
+"<a1> Simple </a> <a2> Complete </a> <a3> ISBD </a> <a4> Add to shelf </a> "
+"<a5> Print </a>"
 msgstr ""
+"<a1>簡要</a>　<a2>詳盡</a>　<a3>ISBD</a>　<a4>新增至虛擬書架</a>　<a5>列印</"
+"a>"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-ISBDdetail.tmpl:4
+#. %1$s: TMPL_VAR name=shelfname
+#. %2$s: TMPL_VAR name=shelfbookcount
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:70
 #, c-format
-msgid "<a1> Normal </a> <a2> MARC </a> <a3> Print </a>"
-msgstr ""
+msgid "<a1>%s</a> (%s item(s))"
+msgstr "<a1>%s</a>（%s 項圖書資料）"
 
 #. %1$s: TMPL_VAR name=subject
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:53
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:59
 #, c-format
 msgid "<a1>%s</a>,"
 msgstr "<a1>%s</a>,"
@@ -263,12 +262,19 @@ msgstr "<a1>%s</a>,"
 #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-bottom.inc:9
 #, c-format
 msgid "<a1>Log In</a> to Koha"
-msgstr "<a1>登入</a>Koha"
+msgstr "<a1>登入</a> Koha"
 
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:72
 #, c-format
 msgid "<a1>Log in to Koha</a> to have personal options."
-msgstr ""
+msgstr "如欲使用個人選項，請先<a1>登入</a> Koha。"
+
+#. %1$s: TMPL_VAR name=surname
+#. %2$s: TMPL_VAR name=firstname
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:136
+#, c-format
+msgid "<a1>Modify</a> %s%s"
+msgstr "<a1>修改</a> %s%s"
 
 #. %1$s: TMPL_VAR name=issues
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:81
@@ -277,7 +283,7 @@ msgid "<b><a1>Total Issues:</a></b> %s"
 msgstr "<b><a1>借書次數：</a></b> %s"
 
 #. %1$s: TMPL_VAR name=additional
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:44
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:50
 #, c-format
 msgid "<b>Additional Author:</b>%s"
 msgstr "<b>其他著者：</b>%s"
@@ -290,8 +296,8 @@ msgstr "<b>其他著者：</b>%s"
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=author
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:43
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:30
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:49
 #, c-format
 msgid "<b>Author:</b> %s"
 msgstr "<b>著者：</b>%s"
@@ -360,9 +366,9 @@ msgstr "<b>杜威分類號：</b><a1>%s</a>"
 
 #. %1$s: TMPL_VAR name=dewey
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:42
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Dewey:</b>%s"
-msgstr "<b>日期：</b>%s"
+msgstr "<b>杜威分類號：</b>%s"
 
 #. %1$s: TMPL_VAR name=biblioitemnumber
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:84
@@ -410,7 +416,7 @@ msgid "<b>Item lost:</b> %s"
 msgstr "<b>遺失圖書資料：</b>%s"
 
 #. %1$s: TMPL_VAR name=itemtype
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:60
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:66
 #, c-format
 msgid "<b>Item type : </b>%s"
 msgstr "<b>圖書資料類別：</b>%s"
@@ -462,10 +468,10 @@ msgid "<b>No. of Items:</b> %s"
 msgstr "<b>數量：</b>%s"
 
 #. For the first occurrence,
-#. %1$s: TMPL_VAR name=bnotes
+#. %1$s: TMPL_VAR name=notes
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:39
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:40
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:75
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:39
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-detailprint.tmpl:22
 #, c-format
 msgid "<b>Notes:</b> %s"
@@ -543,22 +549,22 @@ msgid "<b>Subject:</b> %s"
 msgstr "<b>主題：</b>%s"
 
 #. %1$s: TMPL_VAR name=count
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:61
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:67
 #, c-format
 msgid "<b>Total Number of Items:</b> %s"
 msgstr "<b>項目總數：</b>%s"
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=url
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:28
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl:45
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:28
 #, c-format
 msgid "<b>URL:</b> %s"
 msgstr "<b>網址：</b>%s"
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=url
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:59
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:65
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-detailprint.tmpl:27
 #, c-format
 msgid "<b>URL:</b> <a1>%s</a>"
@@ -609,30 +615,36 @@ msgstr "<b>出版者：</b>%s"
 msgid "<b>subtitle:</b>%s"
 msgstr "<b>副題：</b>%s"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:121
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:94
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:179
 msgid "A free can be managed by any user."
-msgstr ""
+msgstr "任何人都有權管理公家書架。"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:120
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:93
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:178
 msgid "A public can be seen by everybody, but managed only by you."
-msgstr ""
+msgstr "任何人都可以看見公開的私人書架，但只有您有權管理"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:127
+#  FIXME grammatical mistake in original ("every words")
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:147
 msgid ""
 "A search is done on every words you enter. Empty words are ignored. If you "
 "enter, for example \"the two towers\" in the title, the result list will "
 "contain all the books containing two AND tower in the title. The \"the\" "
 "will be discarded."
 msgstr ""
+"查詢時會用您所輸入的所有字詞作出搜尋，但某些不重要的字會被忽略。例如，如果您"
+"在題名欄輸入「the two towers」，查詢結果將會包括所有題名有「two」及「tower」"
+"二字的圖書資料，而「the」字則會被忽略。"
 
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:62
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:64
 msgid "Accepted"
-msgstr ""
+msgstr "已獲採納"
 
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:118
 msgid "Accepted, will be ordered soon"
-msgstr ""
+msgstr "已獲採納，不久便會訂購"
 
 #. %1$s: TMPL_VAR name=firstname
 #. %2$s: TMPL_VAR name=surname
@@ -641,37 +653,47 @@ msgstr ""
 msgid "Account for %s %s"
 msgstr "%s %s 的帳戶"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:111
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:133
 msgid "Acquisition date"
-msgstr ""
+msgstr "採購日期"
 
+#  NOTE「Items」這裡可以算是「圖書資料」，也可以算（畫面顯示的）「項目」
 #. INPUT type=submit
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:41
 msgid "Add Checked Items to Biblio Basket"
-msgstr ""
+msgstr "把點選的項目放至書籃"
 
 #. INPUT type=submit
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:126
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:97
 msgid "Add New Shelf"
-msgstr ""
+msgstr "新增虛擬書架"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:106
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:82
 msgid "Add Shelf"
-msgstr ""
+msgstr "新增虛擬書架"
 
-#. %1$s: TMPL_VAR name=shelfname
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:44
-#, c-format
-msgid "Add a book by barcode in %s:"
-msgstr ""
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:38
+msgid "Add a book by barcode"
+msgstr "按條碼新增圖書資料"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:155
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl:3
+msgid "Add book to bookshelf"
+msgstr "新增圖書資料至虛擬書架"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:145
 msgid "Add or Remove Book Shelves"
-msgstr ""
+msgstr "新增或移除虛擬書架"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:24
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-ISBDdetail.tmpl:29
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-MARCdetail.tmpl:28
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:30
 msgid "Add to basket"
-msgstr ""
+msgstr "新增至書籃"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl:8
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl:20
+msgid "Add to virtual shelf"
+msgstr "新增至虛擬書架"
 
 #. %1$s: TMPL_VAR name=additional
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:20
@@ -684,7 +706,7 @@ msgid "Advanced Search, More Options"
 msgstr "進階查詢（更多選項）"
 
 #. A
-#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:35
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:40
 msgid "Advanced search"
 msgstr "進階查詢"
 
@@ -703,9 +725,8 @@ msgid "Any"
 msgstr "任何"
 
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:13
-#, fuzzy
 msgid "Any word"
-msgstr "關鍵詞"
+msgstr "任何字詞"
 
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:86
 msgid "Anybody"
@@ -713,21 +734,24 @@ msgstr "任何人"
 
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:5
 msgid "Are our records correct?"
-msgstr ""
+msgstr "記錄是否正確？"
 
+# FIXME
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:57
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:59
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:117
 msgid "Asked"
-msgstr ""
+msgstr "已提出"
 
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:29
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:107
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:121
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:54
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:84
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:129
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:141
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:14
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:10
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:28
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:54
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:84
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl:5
 msgid "Author"
 msgstr "著者"
 
@@ -738,7 +762,7 @@ msgid "Author: %s"
 msgstr "著者：%s"
 
 # NOTE See disambiguation notes for "Online"
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:120
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:126
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:77
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:79
 msgid "Available"
@@ -752,46 +776,46 @@ msgstr "條碼 %s"
 
 #. %1$s: TMPL_VAR name=biblionumber
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-detailprint.tmpl:7
-#, fuzzy, c-format
+#, c-format
 msgid "BIBLIO RECORD %s"
-msgstr "條碼 %s"
+msgstr "書目記錄 %s 號"
 
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:5
 msgid "Back to biblio"
-msgstr ""
+msgstr "回書目記錄"
 
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:57
 msgid "Barcode"
 msgstr "條碼"
 
 #. SCRIPT
-#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:24
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
 msgid "Basket is empty"
-msgstr ""
+msgstr "書籃是空的"
 
 #. SCRIPT
-#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:24
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
 msgid "Biblio added to the basket"
-msgstr ""
+msgstr "書目已放在書籃內"
 
 #. A
-#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:39
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:44
 msgid "Biblio basket"
-msgstr ""
+msgstr "書籃"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:67
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:51
 msgid "Bookshelves"
 msgstr "虛擬書架"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:52
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:60
 msgid "Branch"
 msgstr "分館"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:124
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:144
 msgid "Branches"
 msgstr "分館"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:74
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:82
 msgid "Call Number"
 msgstr "索書號"
 
@@ -813,9 +837,11 @@ msgstr "借書證號碼"
 msgid "Catalogue search"
 msgstr "館藏查詢"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:113
-msgid "Category :"
-msgstr ""
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:85
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:109
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:158
+msgid "Category"
+msgstr "類別"
 
 #. INPUT type=submit
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:80
@@ -847,7 +873,7 @@ msgstr "全部清空"
 msgid "Close"
 msgstr "關閉"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:50
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:56
 msgid "Collection:"
 msgstr "館藏："
 
@@ -857,11 +883,10 @@ msgstr "館藏："
 msgid "Collection: %s"
 msgstr "館藏：%s"
 
-#. %1$s: TMPL_VAR name=shelfname
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:8
-#, c-format
-msgid "Contents of %s"
-msgstr ""
+#  NOTE 虛擬書架內含多少本書 (shelfbookcount)
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:110
+msgid "Content size"
+msgstr "書目數量"
 
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:30
 msgid "Copies"
@@ -883,38 +908,38 @@ msgid "Delete"
 msgstr "移除"
 
 #. INPUT type=submit
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:97
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:75
 msgid "Delete Shelves"
 msgstr "移除虛擬書架"
 
 # TODO 要覆查譯文
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:68
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:74
 msgid "Detailed notes:"
 msgstr "備注詳情："
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:108
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:130
 msgid "Dewey"
-msgstr ""
+msgstr "杜威分類號"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:58
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:64
 msgid "Dewey:"
-msgstr ""
+msgstr "杜威分類號："
 
 #. %1$s: TMPL_VAR name=dewey
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:28
 #, c-format
 msgid "Dewey: %s"
-msgstr ""
+msgstr "杜威分類號：%s"
 
 #. SCRIPT
-#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-basket-top.inc:18
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-basket-top.inc:19
 msgid "Do you want to empty the basket ?"
-msgstr ""
+msgstr "要清空書籃嗎？"
 
 #. SCRIPT
-#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-basket-top.inc:18
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-basket-top.inc:19
 msgid "Do you want to remove selected biblios ?"
-msgstr ""
+msgstr "要移除點選的書目嗎？"
 
 # NOTE 譯文更動 by Arthur
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:55
@@ -942,25 +967,32 @@ msgstr "請輸入您的建議"
 msgid ""
 "Fill this form to suggest the library a new acquisition. You will be mailed "
 "when the library treats you suggestion"
-msgstr "要建議圖書館採購一項新的圖書資料，使用這份表格即可。當館方處理您的建議時，您將會收到電郵通知。"
+msgstr ""
+"要建議圖書館採購一項新的圖書資料，使用這份表格即可。當館方處理您的建議時，您"
+"將會收到電郵通知。"
 
+#  NOTE
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:39
 msgid "Filter on"
-msgstr ""
+msgstr "過濾條件："
 
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-account.tmpl:9
 msgid "Fines & charges"
-msgstr ""
+msgstr "罰款及收費"
 
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-userupdate.tmpl:12
 msgid "First name"
 msgstr "名"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:116
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:89
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:128
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:171
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:173
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl:17
 msgid "Free"
-msgstr ""
+msgstr "公家書架"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:60
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:61
 msgid "Friday"
 msgstr "星期五"
 
@@ -968,13 +1000,13 @@ msgstr "星期五"
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:6
 #, c-format
 msgid "Hi, Here is the biblio basket sent by %s"
-msgstr ""
+msgstr "您好！這是 %s 送來的書籃"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:118
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:138
 msgid "Hints"
 msgstr "提示"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:33
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:38
 msgid "Home"
 msgstr "返回首頁"
 
@@ -982,17 +1014,17 @@ msgstr "返回首頁"
 msgid "Home phone"
 msgstr "住宅電話"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:82
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:90
 msgid "ISBN"
 msgstr "國際標準書號"
 
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:16
 msgid "ISBN/ISSN"
-msgstr ""
+msgstr "國際標準書號/期刊號"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:49
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:55
 msgid "ISBN:"
-msgstr ""
+msgstr "國際標準書號："
 
 #. %1$s: TMPL_VAR name=ISBN
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:17
@@ -1000,36 +1032,45 @@ msgstr ""
 msgid "ISBN: %s"
 msgstr "國際標準書號：%s"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:128
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:148
 msgid ""
 "If you want to enter a partial word, add a * or a % at the end of the word. "
 "For example \"two tower*\" will retrieve \"the two towers\", \"two white "
 "towers\", \"a tower and two cities\""
 msgstr ""
+"假如您只想輸入字詞的部分，在字詞後鍵入「*」號或「%」號即可。例如，「two "
+"tower*」會找到「the two towers」、「two white towers」及「a tower and two "
+"cities」"
 
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:5
 msgid "Impossible to set reserve because"
-msgstr ""
+msgstr "無法預約，因為"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:21
+#  FIXME 要覆查譯文
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-ISBDdetail.tmpl:26
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-MARCdetail.tmpl:25
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:27
 msgid "Issues"
-msgstr ""
+msgstr "期數"
 
+#  FIXME 要覆查譯文
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:4
 msgid "Issues for a subscription"
-msgstr ""
+msgstr "訂閱期數"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:77
+#  FIXME 要覆查譯文
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:79
 msgid "Issues summary"
-msgstr ""
+msgstr "摘要"
 
+#  FIXME This is horrible. Need to either fix the .tmpl file or the tokenizer
 #. %1$s: TMPL_VAR name=startdate
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:9
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:10
 #, c-format
 msgid "It began on <b>%s</b> and is issued every <b>"
-msgstr ""
+msgstr "由 <b>%s</b> 開始訂閱，每 <b>"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:99
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:105
 msgid "Item"
 msgstr "圖書資料"
 
@@ -1038,15 +1079,15 @@ msgid "Item Count"
 msgstr "數量"
 
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:29
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:44
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:52
 msgid "Item Type"
 msgstr "圖書資料類別"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:66
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:74
 msgid "Item barcode"
 msgstr "圖書資料條碼"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-MARCdetail.tmpl:226
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-MARCdetail.tmpl:236
 msgid "Items"
 msgstr "圖書資料"
 
@@ -1059,7 +1100,7 @@ msgid "Koha Login"
 msgstr "登入Koha"
 
 #. A
-#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:33
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:38
 msgid "Koha home page"
 msgstr "Koha首頁"
 
@@ -1067,7 +1108,7 @@ msgstr "Koha首頁"
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:30
 #, c-format
 msgid "LCCN: %s"
-msgstr ""
+msgstr "LCCN: %s"
 
 #. %1$s: TMPL_VAR name=cardnumber
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:6
@@ -1100,7 +1141,7 @@ msgid "Me"
 msgstr "我"
 
 #. A
-#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:37
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:42
 msgid "Member Home page"
 msgstr "個人首頁"
 
@@ -1112,7 +1153,15 @@ msgstr "更新個人資料"
 msgid "Message from the library"
 msgstr "圖書館通告"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:48
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:111
+msgid "Modify"
+msgstr "修改"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:154
+msgid "Modify shelf"
+msgstr "修改虛擬書架"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:49
 msgid "Monday"
 msgstr "星期一"
 
@@ -1122,11 +1171,10 @@ msgstr "星期一"
 msgid "N&#176;%s)"
 msgstr "%s號)"
 
-#. %1$S: type=text name=addshelf
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:111
-#, c-format
-msgid "Name : %S"
-msgstr "名稱：%S"
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:83
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:156
+msgid "Name"
+msgstr "名稱"
 
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:25
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:135
@@ -1144,23 +1192,25 @@ msgstr "否"
 
 #. For the first occurrence,
 #. SCRIPT
-#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:24
-#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-basket-top.inc:18
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-basket-top.inc:19
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
 msgid "No biblio added"
-msgstr ""
+msgstr "沒有新增書目記錄"
 
 #. For the first occurrence,
 #. SCRIPT
-#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:24
-#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-basket-top.inc:18
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-basket-top.inc:19
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
 msgid "No biblio selected"
-msgstr ""
+msgstr "未有點選書目"
 
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:6
 msgid ""
 "No fields are mandatory. Fill whatever you know. The \"Note\" field can be "
 "used for whatever you want"
 msgstr ""
+"所有資料都不一定要填，但請儘量填寫您知道的資料。「備注」一欄可以用來填寫任何"
+"您想填的資料。"
 
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:96
 msgid "Not Reservable"
@@ -1189,7 +1239,7 @@ msgstr "注意：預約須繳交手續費<b>$%s</b>"
 msgid "Notes : %s"
 msgstr "備註：%s"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:56
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:62
 msgid "Notes:"
 msgstr "備註："
 
@@ -1201,49 +1251,50 @@ msgstr "好!"
 
 #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-basket-top.inc:6
 msgid "OPAC Basket"
-msgstr ""
+msgstr "線上目錄書籃"
 
 # NOTE 譯文更動 by Arthur
 # NOTE From Chris Cormack's example, the context of "Online" is actually like this:
 # NOTE    Item Type  Class    Location  Date Due   Last Seen  Barcode
 # NOTE    WEB        Website  Online    Available             www.useit.com
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:119
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:125
 msgid "Online"
 msgstr "網上"
 
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:67
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:69
 msgid "Ordered"
-msgstr ""
+msgstr "已訂購"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:104
+#  NOTE 這是「排序方式」而非「訂購人」
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:126
 msgid "Ordered by"
-msgstr ""
+msgstr "排序方式："
 
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:119
-#, fuzzy
 msgid "Ordered by the library"
-msgstr "辦理讀者登記手續"
+msgstr "已由館方訂購"
 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:72
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:52
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:64
 msgid "Other options"
 msgstr "其他選項"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:112
-msgid "Owner :"
-msgstr ""
+#  NOTE 暫譯
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:84
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:157
+msgid "Owner"
+msgstr "架主"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:126
-#, fuzzy
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:146
 msgid "Partial search"
-msgstr "館藏查詢"
+msgstr ""
 
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-auth.tmpl:29
 msgid "Password"
 msgstr "密碼"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:37
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:42
 msgid "Personal page"
 msgstr "個人主頁"
 
@@ -1279,19 +1330,27 @@ msgstr ""
 msgid "Print"
 msgstr "列印"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:114
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:87
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:122
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:161
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:163
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl:15
 msgid "Private"
-msgstr ""
+msgstr "私家書架"
 
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasketform.tmpl:9
 msgid "Problem sending the basket..."
-msgstr ""
+msgstr "送出書籃途中出現問題……"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:115
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:88
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:125
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:166
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:168
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl:16
 msgid "Public"
-msgstr ""
+msgstr "公開的私人書架"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:109
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:131
 msgid "Publication Year"
 msgstr "出版年"
 
@@ -1303,7 +1362,11 @@ msgstr "出版地"
 msgid "Publication year"
 msgstr "出版年"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:45
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:106
+msgid "Published between"
+msgstr "出版年介於"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:51
 msgid "Published by :"
 msgstr "出版者："
 
@@ -1313,61 +1376,66 @@ msgstr "出版者："
 msgid "Published by: %s"
 msgstr "出版者：%s"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:90
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:110
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:98
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:132
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:12
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:30
 msgid "Publisher"
 msgstr "出版者"
 
+# FIXME
 #. %1$S: type=text name=value
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:31
 #, c-format
 msgid "Quick search : %S"
-msgstr ""
+msgstr "快速搜尋：%S"
+
+# FIXME
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:121
+msgid "Received by the library"
+msgstr "館方已收貨"
 
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:38
 msgid "Recent acquisitions"
 msgstr "新書"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:121
-#, fuzzy
-msgid "Recieved by the library"
-msgstr "辦理讀者登記手續"
-
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:72
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:74
 msgid "Rejected"
-msgstr ""
+msgstr "已被拒"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:80
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:86
 msgid "Related links:"
 msgstr "相關網頁："
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:123
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:143
 msgid ""
 "Remember that a title can concern a physical author (Victor Hugo) or a "
 "company, group, collective author (CNRS, Library of Congress)"
 msgstr ""
+"請注意，圖書資料的題名可能是關於一個著者（例如 Victor Hugo）、一間公司、一個"
+"機構、或者一個組織（例如 CNRS、美國國會圖書館）等"
 
+#  NOTE「Items」這裡可以算是「圖書資料」，也可以算（畫面顯示的）「項目」
 #. INPUT type=submit
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:33
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:29
 msgid "Remove Selected Items"
-msgstr ""
+msgstr "移除點選的圖書資料"
 
+#  TODO check translation
 #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-basket-menu.inc:6
 msgid "Remove selection"
-msgstr ""
+msgstr "移除選項"
 
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:59
 msgid "Renewable"
 msgstr "可續借"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:16
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-ISBDdetail.tmpl:21
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:94
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-MARCdetail.tmpl:20
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:22
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:28
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-ISBDdetail.tmpl:15
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-MARCdetail.tmpl:16
 msgid "Request"
 msgstr "預約"
 
@@ -1377,9 +1445,9 @@ msgstr "預約日期"
 
 #. %1$s: TMPL_VAR name=title
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:3
-#, fuzzy, c-format
+#, c-format
 msgid "Reserve page for <i>%s</i>"
-msgstr "圖書資料《<b>%s (%s %s)</b>》之預約頁"
+msgstr "《<b>%s</b>》之預約頁"
 
 # NOTE 譯文更動 by Arthur
 #. %1$s: TMPL_VAR name=startfrom
@@ -1397,60 +1465,72 @@ msgstr "共%3$s項結果中的第%1$s至%2$s項結果"
 #. %3$s: TMPL_VAR name=total
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:31
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:121
-#, fuzzy, c-format
+#, c-format
 msgid "Results <b><i>%s</i> through <i>%s</i> of <i>%s</i></b>"
 msgstr "共<i>%3$s</i>項結果中的第<i>%1$s</i>至<i>%2$s</i>項結果"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:97
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:119
 msgid "Results per page :"
 msgstr "每頁顯示筆數："
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:63
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:64
 msgid "Saturday"
 msgstr "星期六"
 
 #. INPUT type=submit
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:50
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:45
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:182
 msgid "Save"
 msgstr "儲存"
 
+# FIXME 很差的譯文，一定要重譯
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:9
-#, fuzzy
 msgid "Search on"
-msgstr "查詢"
+msgstr "查詢條件："
 
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:22
 msgid "Search the catalogue"
 msgstr "查詢館藏"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:82
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:61
 msgid "Select Shelves to Delete"
-msgstr ""
+msgstr "請選擇要移除的虛擬書架"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:125
+# FIXME wrong grammar in original text
+# FIXME 很差的譯文，一定要重譯
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:145
 msgid ""
 "Select a branch if you want to limit your search to items in a specific "
 "branch. By default the search is done on every branches of the library"
 msgstr ""
+"假如您只想查詢某一間分館的館藏，請先選擇分館；否則查詢結果會包括所有分館的館"
+"藏。"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl:6
+msgid "Select bookshelf"
+msgstr "請選擇虛擬書架"
 
 #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-basket-menu.inc:8
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasketform.tmpl:15
 msgid "Send"
-msgstr ""
+msgstr "送出"
 
 #. INPUT type=submit
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:18
 msgid "Send suggestion to the library staff"
-msgstr ""
+msgstr "傳送建議給館方人員"
 
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasketform.tmpl:4
 msgid "Sending the basket"
-msgstr ""
+msgstr "送出書籃中"
 
+#  FIXME 這個，看了原始碼也不明白是什麼
 #. A
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:20
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-ISBDdetail.tmpl:25
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-MARCdetail.tmpl:24
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:26
 msgid "Serial issues"
-msgstr ""
+msgstr "期刊期數"
 
 #. %1$s: TMPL_VAR name=serial
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:27
@@ -1458,19 +1538,27 @@ msgstr ""
 msgid "Serial: %s"
 msgstr "期刊：%s"
 
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:44
+msgid "Series title"
+msgstr "集叢題名"
+
 #. INPUT type=submit
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:93
 msgid "Set Filter"
-msgstr ""
+msgstr "設定過濾條件"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:137
-msgid "Shelf List"
-msgstr ""
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:8
+msgid "Shelf content"
+msgstr "虛擬書架內容"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:28
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:73
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:31
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:105
 msgid "Shelf list"
-msgstr ""
+msgstr "虛擬書架一覽"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:108
+msgid "Shelf name"
+msgstr "虛擬書架名稱"
 
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-auth.tmpl:5
 msgid "Sorry, KOHA doesnt think you have permission for this page."
@@ -1486,7 +1574,7 @@ msgid "Sorry, your session has timed out, please login again."
 msgstr "對不起，您的登入已逾時，請重新登入。"
 
 #. INPUT type=submit
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:60
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:68
 msgid "Start search"
 msgstr "開始查詢"
 
@@ -1507,7 +1595,7 @@ msgstr "地址"
 msgid "Subject"
 msgstr "主題"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:51
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:57
 msgid "Subject(s):"
 msgstr "主題"
 
@@ -1524,13 +1612,14 @@ msgstr "主題：%s"
 msgid "Submit"
 msgstr "遞交"
 
+#  FIXME 很差的譯文
 #. %1$s: TMPL_VAR name=bibliotitle
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:8
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:9
 #, c-format
 msgid "Subscription information for %s"
-msgstr ""
+msgstr "%s 的訂閱資料"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:42
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:48
 msgid "Subtitle:"
 msgstr "副題："
 
@@ -1540,23 +1629,26 @@ msgstr "副題："
 msgid "Subtitle: %s"
 msgstr "副題：%s"
 
+#  NOTE Table header
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:32
 msgid "Suggested by"
-msgstr ""
+msgstr "建議者"
 
+# FIXME grammatical mistake in original text
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:120
 msgid "Suggestion rejected : won't be buy"
-msgstr ""
+msgstr "建議被拒，不會採購"
 
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:23
 msgid "Suggestions"
-msgstr ""
+msgstr "新書建議"
 
+#  FIXME 字典這樣譯，但聽來是錯的
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:44
 msgid "Summary"
-msgstr ""
+msgstr "摘要"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:66
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:67
 msgid "Sunday"
 msgstr "星期日"
 
@@ -1568,7 +1660,7 @@ msgstr "姓"
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasketform.tmpl:7
 #, c-format
 msgid "The basket was sent to: %s"
-msgstr ""
+msgstr "書籃已送給：%s"
 
 #. %1$s: TMPL_VAR name=reservecount
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:20
@@ -1576,43 +1668,47 @@ msgstr ""
 msgid "There are <b>%s</b> reserves already on this item."
 msgstr "已有<b>%s</b>人預約了這項資料。"
 
+#  FIXME this is ok, but sort of HKish
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:83
 #, c-format
 msgid ""
 "This Library is powered by <a1>Koha</a> free software ILS, and compliant "
 "with web standards <a2>"
 msgstr ""
+"本館採用 <a1>Koha</a> 整合圖書館系統，一套依隨互聯網標準的自由軟體。<a2>"
 
 #. SCRIPT
-#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:24
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
 msgid "This biblio is already in the basket"
-msgstr ""
+msgstr "這個書目已在書籃內"
 
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:13
 msgid ""
 "This card has been declared lost. Reserve impossible. Please contact the "
 "library"
-msgstr ""
+msgstr "根據館方的紀錄，這張證已經遺失，因此無法預約。請與圖書館聯絡。"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:128
+#. %1$s: TMPL_VAR name=subscriptionsnumber
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:134
 #, c-format
 msgid ""
-"This is a serial subscription. You can see which <a1> Issues </a> we have "
-"and don't have"
-msgstr ""
+"This is a serial subscription (we have %s subscriptions). You can see which "
+"<a1> Issues </a> we have and don't have"
+msgstr "這是訂閱的期刊（本館有 %s 期），您可以檢查<a1>館內有那幾期</a>。"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:57
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:58
 msgid "Thursday"
 msgstr "星期四"
 
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:21
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:106
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:119
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-userupdate.tmpl:11
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:53
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:83
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:128
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:139
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:9
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:27
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:53
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:83
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-userupdate.tmpl:11
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl:4
 msgid "Title"
 msgstr "題名"
 
@@ -1621,11 +1717,11 @@ msgid "Total Due"
 msgstr "共欠"
 
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:145
-#, fuzzy, c-format
+#, c-format
 msgid "Try another <a1>Advanced search</a>"
-msgstr "請以別的條件重試<a1>查詢</a>"
+msgstr "請重試<a1>進階搜尋</a>"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:51
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:52
 msgid "Tuesday"
 msgstr "星期二"
 
@@ -1641,7 +1737,7 @@ msgstr "網址：%s"
 msgid "Unified title: %s"
 msgstr "劃一題名：%s"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:57
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:63
 msgid "Unititle:"
 msgstr "劃一題名："
 
@@ -1654,9 +1750,10 @@ msgstr "更新紀錄"
 msgid "Valid XHTML 1.0!"
 msgstr "有效的 XHTML 1.0!"
 
+#  NOTE「manage」這樣譯應該算是很不通順
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:58
 msgid "View & manage suggestions"
-msgstr ""
+msgstr "檢示及維護新書建議"
 
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:17
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:24
@@ -1669,28 +1766,26 @@ msgid "Virtual shelves"
 msgstr "虛擬書架"
 
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:13
-#, fuzzy
 msgid "Volume"
-msgstr "返回首頁"
+msgstr "集叢號/敘述"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:118
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:124
 msgid "Website"
 msgstr "網站"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:54
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:55
 msgid "Wednesday"
 msgstr "星期三"
 
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:64
-#, fuzzy
 msgid "Which is to be picked up from"
-msgstr "上列圖書資料之取書處為<b>%s</b>。"
+msgstr "取書處："
 
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-userupdate.tmpl:16
 msgid "Work/Fax phone"
 msgstr "辦公電話/傳真"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:55
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:61
 msgid "Year :"
 msgstr "年："
 
@@ -1708,20 +1803,23 @@ msgstr "您在不同的IP位址使用Koha！請重新登入。"
 msgid ""
 "You are gone without address. Reservation is forbidden. Please contact the "
 "library"
-msgstr ""
+msgstr "您已經搬遷，但地址不詳，因此不可預約。請與圖書館聯絡。"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:120
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:140
 msgid ""
 "You can enter a complete or a part of a title. The search will also be done "
 "in subtitles and other title related fields"
 msgstr ""
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:122
+#  FIXME 譯文有待改進
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:142
 msgid ""
 "You can enter a name or a surname. The search will also be done in "
 "additional authors and other author related fields (translator, "
 "illustrator...)"
 msgstr ""
+"您可以輸入著者的姓或名。附加著者及其他有關的欄位（譯者、繪圖等等）也會列入搜"
+"尋範圍之內。"
 
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:9
 msgid "You did not specify any search criteria"
@@ -1769,68 +1867,71 @@ msgstr "您可取書的預約圖書資料："
 #. %1$s: TMPL_VAR name=searchdesc
 #. %2$s: TMPL_VAR name=total
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:4
-#, fuzzy, c-format
+#, c-format
 msgid "You searched on <b>%s</b>. %s results found"
-msgstr "您查詢<b>%s</b>"
+msgstr "您查詢「<b>%s</b>」，找到了 %s 筆結果"
 
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:14
 msgid "Your account is temporarily suspended. Please contact the library"
-msgstr ""
+msgstr "您的借書權利已被暫停。請與圖書館聯絡。"
 
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:2
 msgid "Your biblio basket"
-msgstr ""
+msgstr "您的書籃"
 
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-userupdate.tmpl:6
 msgid "Your changes won't appear until the library has validated them."
 msgstr "圖書館核實您的作的修改後，修改才會生效。"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:119
-msgid "a private bookshelf is managed by you & can be seen only by you."
-msgstr ""
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:92
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:177
+msgid "a private bookshelf is managed by you &amp; can be seen only by you."
+msgstr "私家書籃由您自己管理，也只有您才看見。"
 
-# NOTE This refers to new books acquired in the last so-and-so days
-# NOTE This is essentially the same string as the next, but different
-# NOTE due to technical difficulties (in creating an msgid from the HTML)
-# FIXME This string as it is is nearly untranslatable. The scanner need to be fixed.
 #. SCRIPT
-#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:24
-#, fuzzy
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
 msgid "already in the basket"
-msgstr "最近新到的 %s 圖書資料：最近"
+msgstr "已在書籃內"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:105
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:98
+msgid "back to shelf list"
+msgstr "回虛擬書架一覽"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:111
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:12
 msgid "barcode"
 msgstr "條碼"
 
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:11
 msgid "basket.txt"
-msgstr ""
+msgstr "basket.txt"
 
 # NOTE 譯文更動 by Arthur
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:103
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:109
 msgid "date Due"
 msgstr "歸還日期"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:12
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:13
 msgid "day"
 msgstr "日"
 
 #. INPUT type=image name=delete
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:24
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:63
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:11
 msgid "delete"
 msgstr "移除"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:69
+#  FIXME This is horrible. Need to either fix the .tmpl file or the tokenizer
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:70
 msgid "for"
-msgstr ""
+msgstr "出版，已訂閱"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:46
+#  FIXME This is horrible. Need to either fix the .tmpl file or the tokenizer
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:52
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:21
-#, fuzzy
 msgid "in"
-msgstr "讀者登記"
+msgstr "在"
 
 #. IMG
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:17
@@ -1838,17 +1939,17 @@ msgid "koha"
 msgstr "Koha"
 
 #. IMG
-#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:34
 msgid "koha logo"
 msgstr "Koha標誌"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:104
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:110
 msgid "last Seen"
 msgstr "最近出現"
 
 #  NOTE 存放地點 used by HKPL; libraries in Taiwan seems to always write 館藏地
 #  NOTE The HKPL term seems to be more understandable
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:102
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:108
 msgid "location"
 msgstr "存放地點"
 
@@ -1859,7 +1960,7 @@ msgstr "登入"
 
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasketform.tmpl:13
 msgid "mail sent by"
-msgstr ""
+msgstr "發件人"
 
 #. INPUT type=image name=submit
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:22
@@ -1867,57 +1968,75 @@ msgstr ""
 msgid "modify"
 msgstr "修改"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:24
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:25
 msgid "month"
-msgstr "月刊"
+msgstr "月"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:45
-#, fuzzy
+#  FIXME This is horrible. Need to either fix the .tmpl file or the tokenizer
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:46
 msgid "on"
-msgstr "讀者登記"
+msgstr "在"
 
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-moredetail.tmpl:68
 msgid "on issue bit"
 msgstr "借出"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:33
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl:11
+msgid "or add to a new bookshelf"
+msgstr "或新增至新的虛擬書架"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/popup-top.inc:5
+msgid "popup"
+msgstr "彈出通知"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:34
 msgid "quarter"
-msgstr "季刊"
+msgstr "å­£"
 
+#  FIXME 這個（在原文）很有問題
 #. %1$s: TMPl_VAR name=startdate
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:74
-#, fuzzy, c-format
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:75
+#, c-format
 msgid "since <b>%s</b>"
-msgstr "您查詢<b>%s</b>"
+msgstr "由 <b>%s</b> 開始"
+
+#. META http-equiv=Content-Type
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-basket-top.inc:7
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/popup-top.inc:6
+#: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:12
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:11
+msgid "text/html; charset=iso-8859-1"
+msgstr "text/html; charset=UTF-8"
+
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:13
+msgid "title"
+msgstr "題名"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:15
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:16
 msgid "week"
-msgstr "週刊"
+msgstr "週"
 
-#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:39
+#: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:40
 msgid "year"
-msgstr "年刊"
+msgstr "å¹´"
 
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:9
-#, fuzzy
 msgid "you already have a reserve placed on this item."
 msgstr "您已預約了這項資料。"
 
 #. %1$s: TMPL_VAR name=too_many_reserves
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:8
-#, fuzzy, c-format
+#, c-format
 msgid "you cannot make more than %s reserves."
-msgstr "對不起，您不可預約超過%s項資料。"
+msgstr "您不可預約超過 %s 項資料。"
 
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:11
-#, fuzzy
 msgid "you must select a branch for pickup!"
-msgstr "您一定要撰擇在哪間分館取書！"
+msgstr "您一定要撰擇在那裏取書！"
 
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:10
-#, fuzzy
 msgid "you must select at least on item type!"
-msgstr "您一定要撰擇至少一種圖書資料的類別！"
+msgstr "您至少必須選擇圖書資料的類別！"
 
 #. %1$s: TMPL_VAR name=too_much_oweing
 #: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:7
@@ -1928,27 +2047,24 @@ msgstr "您欠 %s"
 #~ msgid "%pNormal%pExact"
 #~ msgstr "%p一般%p完全吻合"
 
+#~ msgid "%s (%s books)"
+#~ msgstr "%s (%s本書)"
+
 #~ msgid "%s <b>acquired in the last %S days</b>"
 #~ msgstr "<b>最近%2$S日內新到的</b>%1$s"
 
+#~ msgid "%s(%s books)"
+#~ msgstr "%s(%s本書)"
+
 #~ msgid "<b>ISBN:</b><a1>%s</a>"
 #~ msgstr "<b>國際標準書號：</b><a1>%s</a>"
 
-#~ msgid "<em><a1>%s (%s)</a></em>"
-#~ msgstr "<em><a1>%s (%s)</a></em>"
-
 #~ msgid "AMOUNT"
 #~ msgstr "金額"
 
 #~ msgid "ARE OUR RECORDS CORRECT?"
 #~ msgstr "紀錄正確嗎？"
 
-#~ msgid "Apr"
-#~ msgstr "四月"
-
-#~ msgid "Aug"
-#~ msgstr "八月"
-
 #~ msgid "Compact Disc"
 #~ msgstr "光碟"
 
@@ -1956,12 +2072,6 @@ msgstr "您欠 %s"
 #~ msgid "Current Loan"
 #~ msgstr "目前狀態"
 
-#~ msgid "Day"
-#~ msgstr "日"
-
-#~ msgid "Dec"
-#~ msgstr "十二月"
-
 #~ msgid "Easy / Picture Books"
 #~ msgstr "淺易/圖畫書"
 
@@ -1979,21 +2089,9 @@ msgstr "您欠 %s"
 #~ msgid "FINES &amp; CHARGES"
 #~ msgstr "罰款及費用"
 
-#~ msgid "Feb"
-#~ msgstr "二月"
-
 #~ msgid "Illustrator"
 #~ msgstr "繪圖"
 
-#~ msgid "Jan"
-#~ msgstr "一月"
-
-#~ msgid "Jul"
-#~ msgstr "七月"
-
-#~ msgid "Jun"
-#~ msgstr "六月"
-
 # NOTE 譯文更動 by Arthur
 #~ msgid "Junior Fiction"
 #~ msgstr "學童/初級小說"
@@ -2002,18 +2100,9 @@ msgstr "您欠 %s"
 #~ msgid "Junior Non-Fiction"
 #~ msgstr "學童/初級非小說"
 
-#~ msgid "KOHA"
-#~ msgstr "KOHA"
-
 #~ msgid "KOHA: OPAC Catalogue Search"
 #~ msgstr "KOHA：查詢館藏"
 
-#~ msgid "Log In to Koha"
-#~ msgstr "登入Koha"
-
-#~ msgid "Mar"
-#~ msgstr "三月"
-
 #~ msgid "Next Page"
 #~ msgstr "下一頁"
 
@@ -2034,18 +2123,12 @@ msgstr "您欠 %s"
 #~ "注意：一旦輸入了「關鍵詞」，即使在其他欄位輸入了其他查詢條件，也只會使用關"
 #~ "鍵字。"
 
-#~ msgid "Nov"
-#~ msgstr "十一月"
-
 #~ msgid "OR :"
 #~ msgstr "或："
 
 #~ msgid "OR one or more from :"
 #~ msgstr "或下列最少一項："
 
-#~ msgid "Oct"
-#~ msgstr "十月"
-
 #~ msgid "Previous Page"
 #~ msgstr "上一頁"
 
@@ -2065,9 +2148,6 @@ msgstr "您欠 %s"
 #~ msgid "Salutation"
 #~ msgstr "稱號"
 
-#~ msgid "Sep"
-#~ msgstr "九月"
-
 # NOTE 譯文更動 by Arthur
 #~ msgid "Something new ?"
 #~ msgstr "有沒有更新？"
@@ -2087,9 +2167,3 @@ msgstr "您欠 %s"
 
 #~ msgid "Young Adult Fiction"
 #~ msgstr "青年小說類"
-
-#~ msgid "text/html; charset=iso-8859-1"
-#~ msgstr "text/html; charset=UTF-8"
-
-#~ msgid "to Koha"
-#~ msgstr "Koha"
diff --git a/misc/translator/po/default_intranet_fr_FR.po b/misc/translator/po/default_intranet_fr_FR.po
index d4b97cd48b..e208fc1f94 100644
--- a/misc/translator/po/default_intranet_fr_FR.po
+++ b/misc/translator/po/default_intranet_fr_FR.po
@@ -1,26 +1,25 @@
-# translation of default_intranet_fr_FR.po to fr_FR
 # Penbwrdd yn Gymraeg.
-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2003 Free Software Foundation, Inc.
 # www.kyfieithu.co.uk<kyfieithu@dotmon.com>, www.gyfieithu.co.uk<kyfieithu@dotmon.com>, 2003.
-# POULAIN <paul@koha-fr.org>, 2005.
 #
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: default_intranet_fr_FR\n"
-"POT-Creation-Date: 2005-01-05 11:39+0100\n"
-"PO-Revision-Date: 2005-01-05 12:01+0100\n"
-"Last-Translator: POULAIN <paul@koha-fr.org>\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2005-02-11 17:35+0100\n"
+"PO-Revision-Date: 2005-01-19 11:05+0200\n"
+"Last-Translator: www.kyfieithu.co.uk <kyfieithu@dotmon.com>, www.gyfieithu."
 "co.uk<kyfieithu@dotmon.com>\n"
-"Language-Team: fr_FR\n"
+"Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.3.1\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8-bit\n"
+"X-Generator: Kartouche 0.2 - 28 October 2003\n"
 "\n"
 
+# 
+# 
 #
-##
 #. For the first occurrence,
 #. SCRIPT
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl:493
@@ -29,8 +28,9 @@ msgstr ""
 msgid " mandatory fields empty (see bold subfields)"
 msgstr "champs obligatoires non renseignés (voir les champs en caractère gras)"
 
+# 
+# 
 #
-##
 #. For the first occurrence,
 #. SCRIPT
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl:493
@@ -64,7 +64,7 @@ msgstr "Les \"Budgets"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/categorie.tmpl:11
 msgid "\"C\" (Children) is a borrower category that has a \"guarantor\""
-msgstr "\"A\"(Enfants) est une catégorie de lecteur qui a un \"garant\""
+msgstr "\"C\"(Enfants) est une catégorie de lecteur qui a un \"garant\""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/categorie.tmpl:9
 msgid ""
@@ -72,8 +72,8 @@ msgid ""
 "borrow from you, in which case Koha expects slightly different information "
 "about the institution;"
 msgstr ""
-"\"C\"peut être utilisé pour les collectivités, telles que d'autres "
-"bibliothèques qui vous empruntent, auquel cas Koha demande une information "
+"\"I\"peut être utilisé pour les collectivités, telles que d'autres "
+"bibliothèques qui vous empruntent, dans ce cas Koha demande une information "
 "lègèrement différente sur la collectivité;"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/itemtypes.tmpl:11
@@ -106,11 +106,14 @@ msgstr "#210|<br/><label>Editeur</label>|{ ; 210a}{ (210b) }{ : 210c}{, 210d}|"
 msgid "#210|(|{210e}{(210f)}{ : 210g}{, 210h}|)"
 msgstr "#210|(|{210e}{(210f)}{ : 210g}{, 210h}|)"
 
+#
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:34
 msgid ""
 "#215|&lt;br/&gt;&lt;label&gt;&nbsp;&lt;/label&gt;|{ ; 215a}{ : 215c}{ ; 215d}"
 "{ + 215e}|"
-msgstr "#215|<br/><label> </label>|{ ; 215a}{ : 215c}{ ; 215d} { + 215e}|"
+msgstr ""
+"#215|&lt;br/&gt;&lt;label&gt;&nbsp;&lt;/label&gt;|{ ; 215a}{ : 215c}{ ; 215d}"
+"{ + 215e}|"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:35
 msgid ""
@@ -124,23 +127,28 @@ msgstr ""
 msgid "#230||{ ; 230a}|"
 msgstr "#230||{ ; 230a}|"
 
+#
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:36
 msgid ""
 "#606|&lt;br/&gt;&lt;label&gt;Sujets&lt;/label&gt;|{ 606a - }|&lt;br/&gt;&lt;"
 "br/&gt;"
-msgstr "#606|<br/><label>Sujets</label>|{ 606a - }|<br/>< br/>"
+msgstr ""
+"#606|&lt;br/&gt;&lt;label&gt;Sujets&lt;/label&gt;|{ 606a - }|&lt;br/&gt;&lt;"
+"br/&gt;"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:28
 msgid "#700|"
 msgstr "#700|"
 
+#
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:37
 msgid "#995|&lt;br&gt;Exemplaires :|{\\n995b}{ - 995j}{/995k}|"
-msgstr "#995|<br>Exemplaires :|{\\n 995b}{ - 995j}{/995k}|"
+msgstr "#995|&lt;br&gt;Exemplaires :|{\\n995b}{ - 995j}{/995k}|"
 
+#
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:24
 msgid "#995|&lt;br&gt;Items :|{\\n995b}{ - 995j}{/995k}|"
-msgstr "#995|<br>Items :|{\\n 995b}{ - 995j}{/995k}|"
+msgstr "#995|&lt;br&gt;Items :|{\\n995b}{ - 995j}{/995k}|"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl:27
 msgid "$itemtypeselect"
@@ -183,7 +191,7 @@ msgid "%S <a1> Search </a>"
 msgstr "%S <a1>Recherche</a>"
 
 #. %1$S: type=text name=pageType
-#: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:142
+#: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:139
 #, c-format
 msgid "%S <a1>[Go to Printer Configuration]</a>"
 msgstr "%S <a1>[Aller à la configuration de l'imprimante]</a>"
@@ -209,9 +217,9 @@ msgstr ""
 "biblio"
 
 #. %1$S: type=text name=text_under_label
-#: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:152
+#: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:149
 #, c-format
-msgid "%S If this field is empty, author and title will be put instead"
+msgid "%S If this field is empty, author and title will be used instead"
 msgstr "%S Si ce champ est vide, l'auteur et le titre seront mis à la place"
 
 #. For the first occurrence,
@@ -230,7 +238,7 @@ msgstr "%S ans"
 
 #. %1$p: type=radio name=label value=<!-- TMPL_VAR NAME="tagname" -->
 #. %2$s: TMPL_VAR name=labelname
-#: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:166
+#: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:162
 #, c-format
 msgid "%p Label %s"
 msgstr "%p Etiquette %s"
@@ -331,6 +339,14 @@ msgstr "%pOui %pNon"
 msgid "%s %s %s, %s"
 msgstr "%s %s %s, %s"
 
+#. %1$s: TMPL_VAR name=firstname
+#. %2$s: TMPL_VAR name=surname
+#. %3$s: TMPL_VAR name=cardnumber
+#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:35
+#, c-format
+msgid "%s %s (%s)"
+msgstr "%s %s (%s)"
+
 #. %1$s: TMPL_VAR name=shelfname
 #. %2$s: TMPL_VAR name=shelfbookcount
 #: ../../koha-tmpl/intranet-tmpl/default/en/shelves.tmpl:78
@@ -371,14 +387,21 @@ msgid ""
 "%s (if you select a value here, the indicators will be limited to the "
 "authorised value list)"
 msgstr ""
-"%s (si vous sélectionnez une valeur ici, les informations seront limités à "
+"%s (si vous sélectionnez une valeur ici, les informations seront limitées à "
 "la liste des valeurs autorisées)"
 
 #. %1$s: TMPL_VAR name=tab
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:40
 #, c-format
 msgid "%s (ignore means that the subfield is NOT managed by Koha)"
-msgstr "%s (non reconnu signifie que le sous-champ n'est pas géré par Koha)"
+msgstr "%s (ignorer signifie que le sous-champ n'est pas géré par Koha)"
+
+#. %1$s: TMPL_VAR name=title
+#. %2$s: TMPL_VAR name=biblionumber
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:19
+#, c-format
+msgid "%s (record %s)"
+msgstr "%s enregistrement %s"
 
 #. %1$s: TMPL_VAR name=subfield
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem.tmpl:39
@@ -390,7 +413,7 @@ msgstr "%s -"
 #. %1$s: TMPL_VAR name=title
 #. %2$s: TMPL_VAR name=author
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/suggestion-select.tmpl:33
-#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:47
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:46
 #: ../../koha-tmpl/intranet-tmpl/default/en/suggestion/acceptorreject.tmpl:24
 #: ../../koha-tmpl/intranet-tmpl/default/en/modbibitem.tmpl:16
 #, c-format
@@ -425,7 +448,7 @@ msgid ""
 "interest).</h1>"
 msgstr ""
 "%s <h1>Informations sur la version actuelle de Koha pour le rapport de "
-"bogues (ou d'intérêt général).</h1>  \t "
+"bogues (ou d'intérêt général).</h1>  \t"
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=biblioitemnumber
@@ -448,7 +471,8 @@ msgstr "%s Sorties"
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:39
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:42
 #, c-format
-msgid "%s URL (if checked, it means that the subfield is an URL and can be clicked"
+msgid ""
+"%s URL (if checked, it means that the subfield is an URL and can be clicked"
 msgstr ""
 "%s URL (si coché, indique que le champ est une URL valide et peut-être "
 "cliquée"
@@ -469,7 +493,7 @@ msgid ""
 "thesaurus-)"
 msgstr ""
 "%s caché (champ géré, mais caché. - devrait être rempli par un module "
-"d'extension ou une liste d'autorité-)"
+"d'extension ou un type d'autorité-)"
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=imported
@@ -484,7 +508,8 @@ msgstr "%s enregistrements import
 #. %3$s: TMPL_VAR name=biblioitemnumber
 #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/AcceptBiblioitem.tmpl:15
 #, c-format
-msgid "%s is already in the database with biblionumber %s and biblioitemnumber %s"
+msgid ""
+"%s is already in the database with biblionumber %s and biblioitemnumber %s"
 msgstr "%s est déjà dans la base de données avec le numéro de notice %s / %s"
 
 #. %1$s: TMPL_VAR name=numberlength
@@ -539,7 +564,7 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:41
 #, c-format
 msgid "%s or thesaurus: %s or plugin: %s"
-msgstr "%s ou liste d'autorité : %s ou module d'extension : %s"
+msgstr "%s ou type d'autorité : %s ou module d'extension : %s"
 
 #. %1$s: TMPL_VAR name=authorised_value
 #. %2$s: TMPL_VAR name=authtypes
@@ -549,7 +574,7 @@ msgstr "%s ou liste d'autorit
 #, c-format
 msgid "%s or thesaurus: %s or plugin: %s or link: %S (exemple :200b)"
 msgstr ""
-"%s ou liste d'autorité : %s ou module d'extension : %s ou lien : %S (exemple "
+"%s ou type d'autorité : %s ou module d'extension : %s ou lien : %S (exemple "
 "200b)"
 
 #. For the first occurrence,
@@ -634,13 +659,33 @@ msgstr "%s ann
 msgid "%s(%s books)"
 msgstr "%s(%s livres)"
 
+#. For the first occurrence,
 #. %1$s: TMPL_VAR name=branchname
 #. %2$s: TMPL_VAR name=itemcallnumber
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detailprint.tmpl:39
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:23
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember-print.tmpl:8
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
+#. For the first occurrence,
+#. %1$s: TMPL_VAR name=streetaddress
+#. %2$s: TMPL_VAR name=zipcode
+#. %3$s: TMPL_VAR name=city
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:9
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:10
+#, c-format
+msgid "%s, %s %s"
+msgstr "%s, %s %s"
+
+#. %1$s: TMPL_VAR name=dateenrolled
+#. %2$s: TMPL_VAR name=expiry
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:18
+#, c-format
+msgid "%s, Expires: %s"
+msgstr "%s, Se termine : %s"
+
 #. %1$s: TMPL_VAR name=year
 #. %2$s: TMPL_VAR name=month
 #. %3$s: TMPL_VAR name=day
@@ -669,13 +714,14 @@ msgstr "%sLien"
 msgid ""
 "%shas been entered into the database with biblionumber %s and "
 "biblioitemnumber %s"
-msgstr "%s a été saisi dans la base de données avec le numéro de notice %s / %s"
+msgstr ""
+"%s a été saisi dans la base de données avec le numéro de notice %s / %s"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/newbasket2.tmpl:31
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/isbnsearch.tmpl:17
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/searchresults.tmpl:42
 msgid "&copy;"
-msgstr "&copier;"
+msgstr "&copy;"
 
 #. INPUT type=submit
 #: ../../koha-tmpl/intranet-tmpl/default/en/reports/inventory.tmpl:81
@@ -704,27 +750,27 @@ msgstr "&lt;&lt; Pr
 msgid "&nbsp No results found."
 msgstr "Pas de réponse"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:144
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:147
 msgid "&nbsp;&nbsp;&nbsp;&nbsp;Issue number&nbsp;&nbsp;&nbsp;&nbsp;"
 msgstr "Numéro"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:145
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:148
 msgid "&nbsp;&nbsp;&nbsp;&nbsp;Planned date&nbsp;&nbsp;&nbsp;&nbsp;"
 msgstr "Date prévue"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:146
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:149
 msgid "&nbsp;&nbsp;&nbsp;&nbsp;Status&nbsp;&nbsp;&nbsp;&nbsp;"
 msgstr "Etat"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:93
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:96
 msgid "&nbsp;&nbsp;&nbsp;&nbsp;X&nbsp;&nbsp;&nbsp;&nbsp;"
 msgstr "X"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:94
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:97
 msgid "&nbsp;&nbsp;&nbsp;&nbsp;Y&nbsp;&nbsp;&nbsp;&nbsp;"
 msgstr "Y"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:95
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:98
 msgid "&nbsp;&nbsp;&nbsp;&nbsp;Z&nbsp;&nbsp;&nbsp;&nbsp;"
 msgstr "Z"
 
@@ -742,6 +788,7 @@ msgstr "Pas de r
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/searchresults.tmpl:66
 #: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/result.tmpl:46
 #: ../../koha-tmpl/intranet-tmpl/default/en/suggestion/acceptorreject.tmpl:32
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/bull-home.tmpl:26
 #, c-format
 msgid "(%s)"
 msgstr "(%s)"
@@ -784,7 +831,7 @@ msgstr ""
 "\"postscript.\"Dites à Koha quelle file d'attente vous voulez utiliser pour "
 "imprimer des rapports directement à partir du serveur.)"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/issuingrules.tmpl:17
 msgid ""
 "(Note : fines are calculated by the fines2.pl script, located in misc "
@@ -817,14 +864,14 @@ msgstr "(si applicable)"
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=innerloop1
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:118
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:120
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:122
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:121
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:123
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:125
 #, c-format
 msgid "(is %s)"
 msgstr "(est %s)"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/export/marc.tmpl:13
+#: ../../koha-tmpl/intranet-tmpl/default/en/export/marc.tmpl:11
 msgid "(leave blank to export every biblio)"
 msgstr "(laisser des blancs pour exporter toutes les notices)"
 
@@ -832,6 +879,14 @@ msgstr "(laisser des blancs pour exporter toutes les notices)"
 msgid "(no categories set)"
 msgstr "(pas de catégories définies)"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember-print.tmpl:10
+msgid "(no email on file)"
+msgstr "(pas d'adresse mail"
+
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember-print.tmpl:9
+msgid "(no phone number on file)"
+msgstr "(pas de numéro de téléphone"
+
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:118
 msgid "(nothing entered)"
 msgstr "(saisie vide)"
@@ -867,14 +922,6 @@ msgstr "* Obligatoire"
 msgid "* fill 1 from :"
 msgstr "Saisir 1 des champs suivants :"
 
-#. For the first occurrence,
-#. %1$s: TMPL_VAR name=pages
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:23
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:24
-#, c-format
-msgid ", %s"
-msgstr ", %s"
-
 #. %1$s: TMPL_VAR name=overduecount
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:45
 #, c-format
@@ -891,6 +938,10 @@ msgstr ",%s En retard"
 msgid "- %s"
 msgstr "- %s"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/issuingrules.tmpl:7
+msgid "- eg: 21,5 enables 21 day loan with 5 issues"
+msgstr "- par exemple : 21,5 autorisé 21 jours et 5 documents"
+
 #. %1$s: TMPL_VAR name=lib.surname
 #. %2$s: TMPL_VAR
 #. %3$s: TMPL_VAR name=libemail
@@ -963,7 +1014,7 @@ msgstr ""
 msgid "/"
 msgstr "/"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:38
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:41
 msgid "1/2 Monthes"
 msgstr "1/2 Mois"
 
@@ -974,23 +1025,23 @@ msgstr "1/2 mois"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:74
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:76
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:47
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:50
 msgid "1/2 quarters"
 msgstr "1/2 trimestre"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:44
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:46
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:29
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:32
 msgid "1/2 weeks"
 msgstr "1/2 semaines"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:84
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:86
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:53
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:56
 msgid "1/2 years"
 msgstr "1/2 années"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:41
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:44
 msgid "1/3 Monthes"
 msgstr "1/3 Mois"
 
@@ -1001,17 +1052,17 @@ msgstr "1/3 mois"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:49
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:51
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:32
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:35
 msgid "1/3 weeks"
 msgstr "1/3 semaines"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:35
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:38
 msgid "1/Month"
 msgstr "1/Mois"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:34
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:36
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:23
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:26
 msgid "1/day"
 msgstr "1/jour"
 
@@ -1022,19 +1073,19 @@ msgstr "1/mois"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:69
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:71
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:44
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:47
 msgid "1/quarter"
 msgstr "1/trimestre"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:39
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:41
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:26
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:29
 msgid "1/week"
 msgstr "1/semaine"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:79
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:81
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:50
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:53
 msgid "1/year"
 msgstr "1/an"
 
@@ -1091,6 +1142,8 @@ msgid ""
 "<!-- TMPL_IF name=\"unitprice\"--><!-- TMPL_VAR NAME=\"unitprice\" --><!-- "
 "TMPL_ELSE --><!-- TMPL_VAR name=\"rrp\" --><!-- /TMPL_IF -->"
 msgstr ""
+"<!-- TMPL_IF name=\"unitprice\"--><!-- TMPL_VAR NAME=\"unitprice\" --><!-- "
+"TMPL_ELSE --><!-- TMPL_VAR name=\"rrp\" --><!-- /TMPL_IF -->"
 
 #. INPUT type= name=email
 #: ../../koha-tmpl/intranet-tmpl/default/en/user/userpage.tmpl:45
@@ -1120,7 +1173,7 @@ msgid ""
 "<a1> Edit biblio </a> <a2> Edit item </a> <a3> delete </a> <a4> Normal </a> "
 "<a5> ISBD </a> <a6> Add to shelf </a> <a7> Print </a>"
 msgstr ""
-"<a1> Editer notice </a> <a2> Editer exemplaires </a> <a3> supprimer </a> "
+"<a1> Editer notice </a> <a2> Editer exemplaires </a> <a3> Supprimer </a> "
 "<a4> Normal </a> <a5> ISBD </a> <a6> Ajouter dans étagère virtuelle </a> "
 "<a7> Imprimer </a>"
 
@@ -1142,12 +1195,7 @@ msgstr ""
 msgid "<a1> Print </a> <a2>%s biblios</a>"
 msgstr "<a1> Editer </a> <a2>%s Notices</a>"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:29
-#, c-format
-msgid "<a1> Subscription </a> <a2> Issues </a>"
-msgstr "<a1> Abonnement </a> <a2> Numéros </a>"
-
-#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:105
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:98
 #, c-format
 msgid "<a1> View Account </a> <a2> Pay Fines </a>"
 msgstr "<a1> Visualiser le compte </a> <a2> Régler des amendes </a>"
@@ -1159,6 +1207,12 @@ msgstr "<a1> Visualiser le compte </a> <a2> R
 msgid "<a1>%s</a> (%s item(s))"
 msgstr "<a1> %s </a> (%s document(s))"
 
+#. %1$s: TMPL_VAR name=subject
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:35
+#, c-format
+msgid "<a1>%s</a>,"
+msgstr "<a1>%s</a>"
+
 #. %1$s: TMPL_VAR name=srvname
 #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/ListFileRecords.tmpl:29
 #, c-format
@@ -1191,6 +1245,11 @@ msgstr ""
 msgid "<a1>Create Manual Invoice</a> &nbsp; <a2>Create Manual Credit</a>"
 msgstr "<a1>Créer une facture manuelle</a>"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:67
+#, c-format
+msgid "<a1>Delete</a> <a2>Issue books</a> <a3>Change Password</a>"
+msgstr "<a1>Supprimer</a> <a2>Prets</a> <a3>Modifier mdp</a>"
+
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/lateissues.tmpl:41
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/bull-home.tmpl:32
 #, c-format
@@ -1206,7 +1265,7 @@ msgstr "<a1>Editer</a> <a2>Num
 #, c-format
 msgid "<a1>Funds</a> <a2>Auth value</a> <a3>Currencies</a> <a4>Printers</a>"
 msgstr ""
-"<a1>Crédits</a> <a2>Valeurs autorisées</a> <a3>Devises</a> <a4>Imprimantes</"
+"<a1>Crédits</a> <a2>Valeurs autorisées</a> <a3>Devises</a> <a4>Imprimantes</ "
 "a>"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes-top.inc:219
@@ -1215,7 +1274,7 @@ msgid ""
 "<a1>Funds</a> <a2>Auth value</a> <a3>Thesaurus</a> <a4>Currencies</a> "
 "<a5>Printers</a>"
 msgstr ""
-"<a1>Crédits</a> <a2> Valeurs autorisées</a> <a3>Thésaurus</a> <a4>Devises</"
+"<a1>Crédits</a> <a2> Valeurs autorisées</a> <a3>Thésaurus</a> <a4>Devises</ "
 "a> <a5>Imprimantes</a>"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes-top.inc:206
@@ -1255,7 +1314,13 @@ msgstr "<a1>Connectez-vous</a> 
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:6
 #, c-format
 msgid "<a1>MARC</a> <a2>ISBD</a> <a3>Add to shelf</a> <a4>Print</a>"
-msgstr "<a1>MARC</a> <a2> ISBD</a><a3> Ajouter à l'étagère</a><a4> Imprimer</a>"
+msgstr ""
+"<a1>MARC</a> <a2> ISBD</a><a3> Ajouter à l'étagère</a><a4> Imprimer</a>"
+
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:76
+#, c-format
+msgid "<a1>Modify User Flags</a> <a2>Print Page</a> <a3>Print Slip</a>"
+msgstr "<a1>Modif habilitations</a> <a2>Impr page</a> <a3>Impr ticket</a>"
 
 #. %1$s: TMPL_VAR name=surname
 #. %2$s: TMPL_VAR name=firstname
@@ -1274,7 +1339,7 @@ msgstr "<a1>Pr
 msgid "<a1>Previous</a> <a2> Next</a>"
 msgstr "<a1>Précédent</a> <a2> Suivant</a>"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/members/readingrec.tmpl:51
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/readingrec.tmpl:56
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/pay.tmpl:41
 #, c-format
 msgid "<a1>Return</a> to Member Record"
@@ -1283,12 +1348,13 @@ msgstr "<a1>Retour</a>
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/bull-top.inc:47
 #, c-format
 msgid "<a1>Search subscription</a> <a2>Late issues</a>"
-msgstr "<a1> Abonnement </a> <a2> Numéros </a>"
+msgstr "<a1> Recherche Abonnement </a> <a2> Numéros en retard </a>"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/members-top.inc:47
 #, c-format
 msgid "<a1>Search</a> <a2>Add member</a> <a3>Add organisation</a>"
-msgstr "<a1>Recherche lecteurs</a> <a2>Ajout lecteur</a><a3>Ajout collectivité</a>"
+msgstr ""
+"<a1>Recherche lecteurs</a> <a2>Ajout lecteur</a><a3>Ajout collectivité</a>"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/reports/reports-home.tmpl:7
 #, c-format
@@ -1308,7 +1374,8 @@ msgstr "<a1>Voir le panier</a> <h1 class=\"acquisition\">"
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc:51
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/marc-top.inc:57
 #, c-format
-msgid "<a1>search</a> <a2>Add biblio</a> <a3>Serial</a> <a4>Virtual shelves</a>"
+msgid ""
+"<a1>search</a> <a2>Add biblio</a> <a3>Serial</a> <a4>Virtual shelves</a>"
 msgstr ""
 "<a1>Recherche</a><a2>Ajout notice</a><a3>Périodiques</a><a4>Etagères "
 "virtuelles</a>"
@@ -1334,26 +1401,26 @@ msgstr "<b><a1>Date d'acc
 msgid "<b><a1>Total Issues:</a></b> %s"
 msgstr "<b><a1>Total des sorties:</a></b> %s"
 
-#. For the first occurrence,
 #. %1$s: TMPL_VAR name=additional
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail-opac.tmpl:24
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:20
 #, c-format
 msgid "<b>Additional Author:</b> %s"
 msgstr "<b>Auteur secondaire:</b> %s"
 
+#. %1$s: TMPL_VAR name=additional
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:26
+#, c-format
+msgid "<b>Additional Author:</b>%s"
+msgstr "<b>Auteur secondaire : </b> %s"
+
+#. For the first occurrence,
 #. %1$s: TMPL_VAR name=author
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail-opac.tmpl:23
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:25
 #, c-format
 msgid "<b>Author:</b> %s"
 msgstr "<b>Auteur:</b> %s"
 
-#. %1$s: TMPL_VAR name=author
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:19
-#, c-format
-msgid "<b>Author:</b> <a1>%s</a>"
-msgstr "<b>Auteur:</b> <a1>%s</a>"
-
 #. %1$s: TMPL_VAR name=biblionumber
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail-opac.tmpl:13
 #, c-format
@@ -1400,9 +1467,7 @@ msgstr "<b>Site:</b> %s, <b>Imprimante:</b> %s <a1>Changer R
 msgid "<b>Cancelled:</b> %s"
 msgstr "<b>Annulé :</b> %s"
 
-#. For the first occurrence,
 #. %1$s: TMPL_VAR name=classification
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:32
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detailprint.tmpl:25
 #, c-format
 msgid "<b>Classification:</b> %s"
@@ -1416,9 +1481,7 @@ msgstr "Classification : %s"
 msgid "<b>Classification:</b> %s%s%s"
 msgstr "Classification %s%s%s"
 
-#. For the first occurrence,
 #. %1$s: TMPL_VAR name=seriestitle
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:25
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detailprint.tmpl:19
 #, c-format
 msgid "<b>Collection:</b> %s"
@@ -1460,9 +1523,7 @@ msgstr "<b>Date d'arriv
 msgid "<b>Date:</b> %s"
 msgstr "<b>Date :</b> %s"
 
-#. For the first occurrence,
 #. %1$s: TMPL_VAR name=dewey
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:31
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detailprint.tmpl:24
 #, c-format
 msgid "<b>Dewey:</b> <a1>%s</a>"
@@ -1473,26 +1534,27 @@ msgid "<b>Dig</b>: see data depending on this one"
 msgstr "<b>Voir aussi</b>: voir les données dépendantes de celle-ci"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:18
+#
 msgid ""
-"<b>EMN (Ecole des Mines de Nantes)</b> (Suggestion, stats modules and "
-"improved ldap support)"
+"<b>EMN (Ecole des Mines de Nantes)</b>, France (Suggestion, stats modules "
+"and improved ldap support funding)"
 msgstr ""
+"<b>EMN (Ecole des Mines de Nantes)</b>, France (Suggestion,module stats support LDAP "
+"amélioré)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:19
+#
 msgid ""
-"<b>ENSMP (Ecole Nationale Supérieure des Mines de Paris)</b> (biblio "
-"frameworks, MARC authorities, OPAC basket, Serials support)"
+"<b>ENSMP (Ecole Nationale Supérieure des Mines de Paris)</b>, France (biblio "
+"frameworks, MARC authorities, OPAC basket, Serials support funding)"
 msgstr ""
-"<b>EMN (Ecole des Mines de Nantes)</b> (modules suggestion et stats, "
-"support ldap amélioré)"
+"<b>ENSMP (Ecole Nationale Supérieure des Mines de Paris)</b> (grilles de "
+"catalogage multiples, autorités MARC, paniers OPAC, Support périodiques)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/branchtransfers.tmpl:114
 msgid "<b>Enter Item Barcode:</b> Item Barcode:"
-msgstr "<b>Entrez le Code à Barres du document :</b> Code à Barres du document:"
-
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:51
-msgid "<b>Esiee School</b> (Jérome Vizcaino, Michel Lerenard, Pierre Cauchois)"
-msgstr "<b>Esiee</b> (Jérome Vizcaino, Michel Lerenard, Pierre Cauchois)"
+msgstr ""
+"<b>Entrez le Code à Barres du document :</b> Code à Barres du document:"
 
 #. %1$s: TMPL_VAR name=biblioitemnumber
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl:68
@@ -1500,7 +1562,7 @@ msgstr "<b>Esiee</b> (J
 msgid "<b>Group Number:</b> %s"
 msgstr "<b>Numéro de Groupe:</b> %s"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/modbibitem.tmpl:101
 msgid ""
 "<b>HELP:</b> You <b>must</b> click on the appropriate radio button (in the "
@@ -1529,9 +1591,10 @@ msgid "<b>Home Branch:</b> %s"
 msgstr "<b>Site d'origine: </b> %s"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:16
+#
 msgid ""
-"<b>Horowhenua Library Trust</b> and Rosalie Blake, Head of Libraries, (Koha "
-"1.0)"
+"<b>Horowhenua Library Trust</b>, New Zealand, and Rosalie Blake, Head of "
+"Libraries, (Koha 1.0)"
 msgstr ""
 "<b>Groupement de bibliothèques de Horowhenua</b> : Rosalie Blake, directrice "
 "des bibliothèques (Koha 1.0)"
@@ -1551,12 +1614,6 @@ msgstr ""
 msgid "<b>ISBN:</b> %s"
 msgstr "<b>ISBN :</b> %s"
 
-#. %1$s: TMPL_VAR name=ISBN
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:17
-#, c-format
-msgid "<b>ISBN:</b> <a1>%s</a>"
-msgstr "<b>ISBN :</b><a1>%s</a>"
-
 #. %1$s: TMPL_VAR name=ISBN
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detailprint.tmpl:28
 #, c-format
@@ -1581,6 +1638,10 @@ msgstr "document perdu :</b> %s"
 msgid "<b>Item type:</b> %s"
 msgstr "<b>Type de document :</b> %s"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:26
+msgid "<b>Katipo Communications</b> (Koha1.0 developpers)"
+msgstr "<b>Katipo Communications</b> (Koha version 1.0)"
+
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:41
 msgid ""
 "<b>KohaAdminEmailAddress --</b> The email address that will receive requests "
@@ -1590,9 +1651,7 @@ msgstr ""
 "lecteurs enverront leurs demandes de modification de leurs documents "
 "enregistrés."
 
-#. For the first occurrence,
 #. %1$s: TMPL_VAR name=lccn
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:33
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detailprint.tmpl:26
 #, c-format
 msgid "<b>LCCN:</b> %s"
@@ -1634,7 +1693,7 @@ msgstr "<b>Dur
 msgid "<b>No. of Items:</b> %s"
 msgstr "<b>Nbre d'exemplaires:</b> %s"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:28
 msgid ""
 "<b>Note:</b> when you add a subscription, Koha consider you already have "
@@ -1652,7 +1711,6 @@ msgstr ""
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=notes
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail-opac.tmpl:28
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:28
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detailprint.tmpl:22
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl:30
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl:59
@@ -1678,6 +1736,10 @@ msgstr "<b>Pages:</b> %s"
 msgid "<b>Paid for:</b> %s"
 msgstr "<b>Payé pour :</b> %s"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:37
+msgid "<b>Pate Eyler</b> (Kaitiaki from 2002 to 2004)"
+msgstr "<b>Pate Eyler</b> (Kaitiaki de 2002 à 2004)"
+
 #: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:24
 msgid "<b>Paul Poulain</b>, 2.2 release manager (MARC developper)"
 msgstr "<b>Paul Poulain</b>, responsable de la version 2.2 (développeur MARC)"
@@ -1700,12 +1762,6 @@ msgstr "<b>Imprimante :</b> %s"
 msgid "<b>Published by :</b>%s"
 msgstr "<b>Edité par :</b>%s"
 
-#. %1$s: TMPL_VAR name=publishercode
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:21
-#, c-format
-msgid "<b>Published by:</b> %s"
-msgstr "<b>Edité par :</b>%s"
-
 #. %1$s: TMPL_VAR name=publishercode
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl:23
 #, c-format
@@ -1744,10 +1800,8 @@ msgstr "<b>Prix de remplacement :</b> %s"
 msgid "<b>Search ISBN or Title:</b> %S"
 msgstr "<b>Cherche ISBN ou Titre :</b> %S"
 
-#. For the first occurrence,
 #. %1$s: TMPL_VAR name=serial
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail-opac.tmpl:30
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:30
 #, c-format
 msgid "<b>Serial:</b> %s"
 msgstr "<b>Périodique:</b> %s"
@@ -1764,32 +1818,16 @@ msgstr "<b>Titre de collection:</b> %s"
 msgid "<b>Size:</b> %s"
 msgstr "<b>Format:</b> %s"
 
-#
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:69
-msgid "<b>Steve Tonnesen</b> (early MARC work, Virtual Bookshelves concept, KohaCD)"
-msgstr ""
-"<b>Steve Tonnesen</b> (préparation MARC, conception des Etagères virtuelles, "
-"KohaCD)"
-
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=subject
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail-opac.tmpl:26
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:26
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detailprint.tmpl:20
 #, c-format
 msgid "<b>Subject:</b> %s"
 msgstr "<b>Sujet :</b> %s"
 
-#. %1$s: TMPL_VAR name=subjects
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:35
-#, fuzzy, c-format
-msgid "<b>Subjects:</b> %s"
-msgstr "<b>Sujet :</b> %s"
-
-#. For the first occurrence,
 #. %1$s: TMPL_VAR name=subtitle
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail-opac.tmpl:22
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:18
 #, c-format
 msgid "<b>Subtitle:</b> %s"
 msgstr "<b>Sous-Titre :</b> %s"
@@ -1797,7 +1835,7 @@ msgstr "<b>Sous-Titre :</b> %s"
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=count
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail-opac.tmpl:31
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:36
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:49
 #, c-format
 msgid "<b>Total Number of Items:</b> %s"
 msgstr "<b>Nombre Total d'exemplaires :</b> %s"
@@ -1810,7 +1848,7 @@ msgstr "<b>URL:</b> %s"
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=url
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:34
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:41
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detailprint.tmpl:27
 #, c-format
 msgid "<b>URL:</b> <a1>%s</a>"
@@ -1819,7 +1857,6 @@ msgstr "<b>URL:</b> <a1>%s</a>"
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=unititle
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail-opac.tmpl:29
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:29
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detailprint.tmpl:23
 #, c-format
 msgid "<b>Unititle:</b> %s"
@@ -1837,12 +1874,6 @@ msgstr "<b>Volume:</b> %s"
 msgid "<b>Year :</b> %s"
 msgstr "<b>Année :</b> %s"
 
-#. %1$s: TMPL_VAR name=copyrightdate
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:27
-#, c-format
-msgid "<b>Year:</b> %s"
-msgstr "<b>Année :</b> %s"
-
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:5
 msgid ""
 "<b>acquisitions --</b> The choices are either \"normal\" or \"simple.\" "
@@ -1851,7 +1882,7 @@ msgid ""
 "that you are going to add materials to the collection without tracking "
 "orders."
 msgstr ""
-"<b>acquisitions --</b> Les choix sont \"normal\" ou \"simple.\" \"Normal"
+"<b>acquisitions --</b> Les choix sont \"normal\" ou \"simple.\" \"Normal "
 "\"règle le système pour suivre les commandes et mettre à jour les "
 "informations sur les budgets et les fournisseurs lorsque vous ajoutez des "
 "exemplaires à votre collection.\"Simple\"dit à Koha que vous allez ajouter "
@@ -1862,17 +1893,18 @@ msgid ""
 "<b>authoritysep --</b> The separator used in authority/thesaurus. Usually \" "
 "-- \". Deprecated & useless in Koha 2.2"
 msgstr ""
-"<b>authoritysep --</b>Le séparateur utilisé dans le thésaurus des autorités."
+"<b>authoritysep --</b>Le séparateur utilisé dans le thésaurus des autorités. "
 "Habituellement \"--\".A éviter et inutile dans Koha 2.2"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:9
+#
 msgid ""
 "<b>autoBarcode --</b> The barcode number to be assigned to items is "
 "automatically assigned (sequentially) by Koha if this is set to \"yes\" (\"1"
 "\" = \"yes\")."
 msgstr ""
 "<b>autoBarcode --</b> Le numéro de code à barres à affecter aux exemplaires "
-"est automatiquement défini (séquentiellement)par Koha si le choix est \"oui"
+"est automatiquement défini (séquentiellement)par Koha si le choix est \"oui "
 "\" (\"1\"=\"oui\")."
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:11
@@ -1893,7 +1925,8 @@ msgid ""
 msgstr ""
 "<b>checkdigit --</b> Contrôles de validité sur le numéro de lecteur (Numéro "
 "de la carte d'emprunteur):rien ou contrôle de type\"Katipo\".Dans la plupart "
-"des cas vous choisirez \"none\"parce que vous utiliserez des codes à barres pré-imprimés"
+"des cas vous choisirez \"none\"parce que vous utiliserez des codes à barres "
+"pré-imprimés"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:15
 msgid ""
@@ -1901,15 +1934,11 @@ msgid ""
 "mm/dd/yyyy, metric = dd/mm/yyy, ISO = yyyy/mm/dd). This controls how dates "
 "are displayed, not how they are stored in the database."
 msgstr ""
-"<b>dateformat --</b> Choisir le format de date \"metric,\" \"us,\" ou \"iso"
+"<b>dateformat --</b> Choisir le format de date \"metric,\" \"us,\" ou \"iso "
 "\"(us=mm/jj/aaaa, metric=jj/mm/aaaa, ISO=aaaa/mm/jj).Cela contrôle comment "
 "les dates sont affichées, mais pas comment elles sont stockées dans la base "
 "de données."
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:49
-msgid "<b>doXulting</b> (Matthieu Branlat) OPAC basket"
-msgstr "<b>doXulting</b> (Matthieu Branlat) panier OPAC"
-
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:17
 msgid ""
 "<b>gist --</b> \"gist\" is \"GST\" (Good and Sales Tax) rate. If your local "
@@ -1920,12 +1949,6 @@ msgstr ""
 "que vous payiez une taxe sur vos achats chez vos fournisseurs, entrez le "
 "taux de la taxe ici.Choisissez \"0\"si vous ne devez pas payé de taxe."
 
-#. %1$s: TMPL_VAR name=publicationyear
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:22
-#, c-format
-msgid "<b>in </b> %s"
-msgstr "<b>en </b>%s"
-
 #. %1$s: TMPL_VAR name=publicationyear
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detailprint.tmpl:16
 #, c-format
@@ -1944,6 +1967,7 @@ msgstr ""
 "\"oui!\""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:43
+#
 msgid ""
 "<b>ldapserver and ldapinfos --</b> Koha 2.0 can use Perl LDAP (Lightweight "
 "Directory Access Protocol, see http://search.cpan.org/~gbarr/perl-ldap-"
@@ -1955,10 +1979,10 @@ msgid ""
 "appear on a new install."
 msgstr ""
 "<b>ldapserver and ldapinfos --</b> Koha 2.0 sait utiliser un annuaire LDAP "
-"(Lightweight Directory Access Protocol,voir http://search.cpan.org/~gbarr/"
+"(Lightweight Directory Access Protocol,voir http://search.cpan.org/~gbarr/ "
 "perl-ldap- 0.3202/lib/Net/LDAP.pod)pour gérer les accès des utilisateurs et "
 "leurs droits.Pour obtenir un paquetage Perl utilisable en bibliothèque sans "
-"ldap, tout ce qui est relié au LDAP a été déplacé dans KohaInstall/modules/"
+"ldap, tout ce qui est relié au LDAP a été déplacé dans KohaInstall/modules/ "
 "C4/Auth_with_ldap.pm.Demandez à votre administrateur système de régler le "
 "LDAP avec Auth_with_ldap.pm (perldoc Auth_with_ldap. pm for help).Ces 2 "
 "paramétrages seront inutiles dans la 2.2 et ne devraient plus apparaïtre "
@@ -2026,7 +2050,7 @@ msgid ""
 "be tried first."
 msgstr ""
 "<b>opacthemes --</b> Règle l'ordre préféré pour les thèmes.Le premier thème "
-"sera essayé d'abord. "
+"sera essayé d'abord."
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:61
 msgid ""
@@ -2071,7 +2095,7 @@ msgstr ""
 msgid ""
 "<b>timeout --</b> Inactivity timeout period (in seconds). If a workstation "
 "is idle for longer than this period, the user will have to login again."
-msgstr "<b>timeout --</b> "
+msgstr "<b>timeout --</b>"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:69
 msgid ""
@@ -2080,16 +2104,16 @@ msgid ""
 "favorite library items if this feature is turned on."
 msgstr "<b>virtualshelves --</b>"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:56
 msgid ""
 "A \"thesaurus category\": it refers to a thesaurus category. See the "
 "corresponding admin table."
 msgstr ""
-"Une \"catégorie d'autorité\" : cela renvoie à une catégorie d'autorité.Voir "
-"la table d'administration correspondante."
+"Un \"type d'autorité\" : cela renvoie à une catégorie d'autorité.Voir la "
+"table d'administration correspondante."
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:52
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:57
 msgid ""
@@ -2097,11 +2121,11 @@ msgid ""
 "the value of the field. They are MARC-flavor dependant and sometimes fill "
 "another subfield automatically."
 msgstr ""
-"\"plug in\" les plugins sont des programmes Perl qui vous aident à entrer la "
-"valeur d'un sous champ. Ils changent en fonction de votre déclinaison MARC "
-"et remplissent parfois un autre champ automatiquement"
+"\"module d'extension\" les modules d'extension sont des programmes Perl qui "
+"vous aident à remplir un sous-champ. Ils changent en fonction de votre "
+"format MARC et remplissent parfois un autre champ automatiquement."
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/help/search.marc/search.tmpl:19
+#: ../../koha-tmpl/intranet-tmpl/default/en/help/search.marc/search.tmpl:20
 msgid "A biblio is selected if it's field <b>contains</b> the term you entered"
 msgstr ""
 "Une notice est sélectionnée si son champ <b>contient</b>le terme que vous "
@@ -2113,8 +2137,11 @@ msgid "A free can be managed by any user."
 msgstr "Une étagère libre peut-être gérée par tous les utilisateurs."
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/members/moremember.tmpl:5
-msgid "A patron's annual membership fee payment status also shows on this screen."
+msgid ""
+"A patron's annual membership fee payment status also shows on this screen."
 msgstr ""
+"Un état de paiement de la cotisation annuelle de lecteur est aussi affiché "
+"sur cette page."
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:96
 #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:181
@@ -2199,6 +2226,14 @@ msgstr "Accept
 msgid "Account Management Fee"
 msgstr "Gestion de la comptabilité des cotisations"
 
+#. %1$s: TMPL_VAR name=firstname
+#. %2$s: TMPL_VAR name=surname
+#. %3$s: TMPL_VAR name=cardnumber
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember-print.tmpl:5
+#, c-format
+msgid "Account Summary: %s %s (%s)"
+msgstr "Résumé pour : %s %s (%s)"
+
 #. %1$s: TMPL_VAR name=firstname
 #. %2$s: TMPL_VAR name=surname
 #: ../../koha-tmpl/intranet-tmpl/default/en/boraccount.tmpl:5
@@ -2238,7 +2273,7 @@ msgstr "Coût R
 msgid "Actual Cost *"
 msgstr "Coût réel *"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:39
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:41
 msgid "Adam Thick"
 msgstr "Adam Thick"
 
@@ -2252,7 +2287,7 @@ msgstr "Adam Thick"
 #: ../../koha-tmpl/intranet-tmpl/default/en/mancredit.tmpl:18
 #: ../../koha-tmpl/intranet-tmpl/default/en/maninvoice.tmpl:21
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:151
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:98
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:101
 msgid "Add"
 msgstr "Ajouter"
 
@@ -2276,8 +2311,7 @@ msgstr "Ajouter une ligne de cr
 msgid "Add Budget"
 msgstr "Ajouter un budget"
 
-#. INPUT type=submit name=submit
-#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:66
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:74
 msgid "Add Child"
 msgstr "Ajouter un enfant"
 
@@ -2347,7 +2381,7 @@ msgid "Add System preference"
 msgstr "Ajouter une préférence système"
 
 #. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:164
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:165
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:160
 msgid "Add Tag"
 msgstr "Ajouter un champ"
@@ -2378,7 +2412,7 @@ msgstr "Ajouter un livre par code 
 msgid "Add a book by barcode in %s:"
 msgstr "Ajouter un livre par code à barre dans %s:"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl:109
 msgid ""
 "Add a member in the library. The member can be attached to any branch of the "
@@ -2400,7 +2434,7 @@ msgstr "Ajouter un abonnement"
 msgid "Add a system preference"
 msgstr "Ajouter une préférence système"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl:111
 msgid ""
 "Add an organisation in the library. This member doesn't have some "
@@ -2425,7 +2459,7 @@ msgstr "Ajouter une valeur autoris
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/auth-top.inc:87
 #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/authorities.tmpl:15
 msgid "Add authority"
-msgstr "Ajouter une autorité"
+msgstr "Ajouter autorité"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:62
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:149
@@ -2437,7 +2471,7 @@ msgstr "Ajouter un type d'autorit
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/isbnsearch.tmpl:83
 #: ../../koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl:77
 msgid "Add biblio"
-msgstr "Ajouter une notice"
+msgstr "Ajouter la notice"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:119
 msgid "Add book fund"
@@ -2448,7 +2482,7 @@ msgid "Add budget"
 msgstr "Ajouter un Budget"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:66
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:289
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:285
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:65
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:286
 msgid "Add category"
@@ -2472,7 +2506,7 @@ msgstr "Ajouter une grille"
 #. INPUT type=button
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem.tmpl:51
 msgid "Add item"
-msgstr "Ajouter un document"
+msgstr "Ajouter un exemplaire"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl:65
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl:156
@@ -2581,6 +2615,7 @@ msgid "Additional authors"
 msgstr "Auteurs secondaires"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/member.tmpl:21
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/member-quicksearch-results.tmpl:13
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:43
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:107
 msgid "Address"
@@ -2600,7 +2635,7 @@ msgstr "Recherche Avanc
 msgid "Age Required"
 msgstr "Age requis"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:41
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:43
 msgid "Al Banks"
 msgstr "Al Banks"
 
@@ -2616,13 +2651,14 @@ msgstr "Tous les bilans du syst
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/user/userpage.tmpl:58
 msgid "Allow library staff to see my reading record"
-msgstr "Autoriser l'équipe de la bibliothèque à consulter la liste de mes emprunts"
+msgstr ""
+"Autoriser l'équipe de la bibliothèque à consulter la liste de mes emprunts"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl:107
 msgid "Allowed"
 msgstr "Autorisé"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:29
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:28
 msgid "Alternative"
 msgstr "Autre"
 
@@ -2635,10 +2671,17 @@ msgid ""
 "Alternatively, you can browse a section of borrowers by selecting the first "
 "letter of the Patron's last name from the list on the right."
 msgstr ""
+"Sinon, vous pouvez parcourir une partie des lecteurs en sélectionnant la "
+"première lettre du nom de famille dans la liste sur la droite."
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:42
-msgid "Ambrose Li (chinese & translation tool)"
-msgstr ""
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:77
+msgid "Ambrose Li"
+msgstr "Ambrose Li"
+
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:44
+#
+msgid "Ambrose Li (translation tool)"
+msgstr "Ambrose Li (outil de traduction)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/mancredit.tmpl:17
 #: ../../koha-tmpl/intranet-tmpl/default/en/maninvoice.tmpl:20
@@ -2646,7 +2689,7 @@ msgstr ""
 msgid "Amount"
 msgstr "Montant"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:51
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:55
 msgid ""
@@ -2656,11 +2699,26 @@ msgstr ""
 "Une \"valeur autorisée\" : renvoie à une liste de valeurs autorisées pour le "
 "sous-champ. Voir dans la table de gestion correspondante"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:43
-msgid "Andrew Arensburger (the small & great C4::Context module)"
-msgstr ""
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/400.tmpl:4
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/401.tmpl:4
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/402.tmpl:4
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/403.tmpl:4
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/404.tmpl:4
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/405.tmpl:4
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/500.tmpl:4
+msgid "An Error has Occurred!"
+msgstr "Une erreur s'est produite"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:40
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:78
+msgid "Andres Tarallo"
+msgstr "Andes Tarallo"
+
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:45
+#
+msgid "Andrew Arensburger (the small &amp; great C4::Context module)"
+msgstr "Andrew Arensburger (le petit et formidable Module C4::Contex.pm)"
+
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:42
 msgid "Andrew Hooper"
 msgstr "Andrew Hooper"
 
@@ -2673,30 +2731,36 @@ msgstr "Chaque %s"
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/members/moremember.tmpl:6
 msgid "Any fines a patron has will show up in the top middle of this screen."
 msgstr ""
+"Toutes les amendes qu'un lecteur a seront affichées dans le mileiu de la "
+"partie supérieure de cette page."
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/members/moremember.tmpl:9
 msgid ""
 "Any items a patron currently has out will show up under \"Items currently on "
 "issue\"."
 msgstr ""
+"Tous les documents qu'un lecteur a actuellement en prêt seront affichés dans "
+"\"Documents actuellement en prêt\"."
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/members/moremember.tmpl:7
 msgid ""
 "Any materials a patron has requested will show up on the top right of this "
 "screen."
 msgstr ""
+"Tous les documents réservés par un lecteur seront affichés en haut à droite "
+"de cette page."
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl:19
 msgid "Any word"
 msgstr "Tous les mots"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:12
-#, fuzzy
+#
 msgid "Apache version"
-msgstr "Version Apache :"
+msgstr "Version Apache"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:111
+#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:120
 msgid "Apr"
 msgstr "Avr"
 
@@ -2706,11 +2770,11 @@ msgstr "Quartier"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl:42
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl:44
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:161
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:164
 msgid "Arrived"
 msgstr "Arrivé"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/statecollection.tmpl:7
 msgid ""
 "Arrived : when an book arrives, you can set it's status to \"arrived\". "
@@ -2721,7 +2785,7 @@ msgstr ""
 "Le bulletin disparait de la liste et le numéro est ajouté dans la liste des "
 "bulletins arrivés (à gauche)"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/statecollection.tmpl:16
 msgid ""
 "Arrived numbers : the list of issues you have in your library. Automatically "
@@ -2738,11 +2802,11 @@ msgstr ""
 msgid "Arrives on"
 msgstr "Arrive le"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:56
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:59
 msgid "Arrives on:"
 msgstr "Arrive le :"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/issuingrules.tmpl:12
 msgid ""
 "Ask your administrator to put this script in crontab, after midnight, to "
@@ -2752,16 +2816,21 @@ msgstr ""
 "tâches (crontab), après minuit, pour que les amendes soient calculées chaque "
 "nuit"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:115
+#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:124
 msgid "Aug"
-msgstr "Aoû"
-
-#
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:129
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:189
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:249
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:309
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:369
+msgstr "Aou"
+
+# 
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:96
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:126
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:156
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:186
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:216
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:246
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:276
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:306
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:336
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:366
 msgid "Auth"
 msgstr "Autorité"
 
@@ -2802,12 +2871,14 @@ msgstr "Valeur Autoris
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/cmsdsearchresults.tmpl:7
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/searchresults.tmpl:42
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/branchtransfers.tmpl:128
-#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:237
-#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:266
+#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:246
+#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:275
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl:186
 #: ../../koha-tmpl/intranet-tmpl/default/en/maint/catmaintain.tmpl:35
 #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl:16
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/readingrec.tmpl:18
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember-print.tmpl:17
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember-print.tmpl:42
 #: ../../koha-tmpl/intranet-tmpl/default/en/reports/inventory.tmpl:39
 #: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl:35
 #: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl:141
@@ -2826,7 +2897,7 @@ msgstr "Auteur"
 msgid "Author:"
 msgstr "Auteur:"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:143
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:144
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:138
 msgid "Authorised"
 msgstr "Autorisé"
@@ -2846,7 +2917,7 @@ msgstr "Valeurs autoris
 msgid "Authorised values admin"
 msgstr "Administration des valeurs autorisées"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/authorised_values.tmpl:2
 msgid "Authorised values management"
 msgstr "Administration des valeurs autorisées"
@@ -2876,7 +2947,8 @@ msgstr "Autorit
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:83
 #, c-format
 msgid "Authority MARC subfield structure admin for tag %s"
-msgstr "Gestion de la structure des sous-champs Marc autorités pour le champ %s"
+msgstr ""
+"Gestion de la structure des sous-champs Marc autorités pour le champ %s"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl:50
 msgid "Authority lib"
@@ -2890,7 +2962,7 @@ msgstr "Grille d'autorit
 #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/authorities.tmpl:6
 #, c-format
 msgid "Authority number %s"
-msgstr "autorité numéro %s"
+msgstr "Autorité numéro %s"
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=authid
@@ -2961,7 +3033,7 @@ msgid "Avail"
 msgstr "Dispo"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail-opac.tmpl:60
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:70
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:86
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl:52
 msgid "Available"
 msgstr "Disponible"
@@ -2985,7 +3057,6 @@ msgstr "PANIER"
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=BIBNUM
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem-nomarc.tmpl:15
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:15
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detailprint.tmpl:7
 #, c-format
 msgid "BIBLIO RECORD %s"
@@ -3008,13 +3079,13 @@ msgstr "Retour 
 msgid "Back to acquisition"
 msgstr "Retour aux acquisitions"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:235
-#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:264
+#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:244
+#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:273
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl:184
 msgid "Bar Code"
 msgstr "Code à Barres"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:47
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:63
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/branchtransfers.tmpl:128
 #: ../../koha-tmpl/intranet-tmpl/default/en/reports/inventory.tmpl:36
 #: ../../koha-tmpl/intranet-tmpl/default/en/modbibitem.tmpl:76
@@ -3033,9 +3104,9 @@ msgid "Barcode <b>%s</b> has already been assigned."
 msgstr "Le Code à Barres <b>%s</b> a déjà été attribué"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/newjmember.tmpl:51
-#, fuzzy
+#
 msgid "Barcode Number"
-msgstr "Numéro de Carte"
+msgstr "Code à barres"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/catalogue-home.tmpl:35
 msgid "Barcode Search"
@@ -3082,7 +3153,7 @@ msgstr "Baycorp Adjustment"
 msgid "Become a Member"
 msgstr "S'inscrire"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/help/circ/returns.tmpl:2
+#: ../../koha-tmpl/intranet-tmpl/default/en/help/circ/returns.tmpl:3
 msgid ""
 "Before you begin, it is very important that you take note of the branch and "
 "printer settings and change them if necessary. This should only have to be "
@@ -3134,7 +3205,7 @@ msgid "Beginnning date (*)"
 msgstr "Date de début (*)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:29
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:20
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:23
 msgid "Beginnning date:"
 msgstr "Date de début"
 
@@ -3142,7 +3213,7 @@ msgstr "Date de d
 msgid "Begins with"
 msgstr "Commence par"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:44
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:46
 msgid "Benedykt P. Barszcz (Polish for 2.0)"
 msgstr "Benedykt P. Barszcz (Polonais pour version 2.0)"
 
@@ -3156,7 +3227,7 @@ msgstr "Recherche de notice"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:5
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:19
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:15
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:18
 msgid "Biblio"
 msgstr "Notice bibliographique"
 
@@ -3167,11 +3238,11 @@ msgstr "R
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/biblio_framework.tmpl:105
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/biblio_framework.tmpl:2
 msgid "Biblio framework"
-msgstr "Grille de catalogage"
+msgstr "Grilles de catalogage"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:44
 msgid "Biblio framework (MARC structure)"
-msgstr "Grille de catalogage"
+msgstr "Grilles de catalogage"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/default.tmpl:5
 msgid "Biblionumber"
@@ -3181,15 +3252,16 @@ msgstr "Num
 msgid "Biblios found"
 msgstr "Notices trouvées"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/isbnsearch.tmpl:63
-msgid "Biblios in breeding farm"
-msgstr "Notices dans le réservoir"
-
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/isbnsearch.tmpl:12
 msgid "Biblios in koha"
 msgstr "Notices dans Koha"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/isbnsearch.tmpl:63
 #
+msgid "Biblios in reservoir"
+msgstr "Notices dans le réservoir"
+
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/aqbookfund.tmpl:3
 msgid "Book Fund Administration"
 msgstr "Gestion des lignes de crédit"
@@ -3201,8 +3273,8 @@ msgid ""
 "acquisitions."
 msgstr ""
 "Les lignes de crédit peuvent être ignorées si vous avez réglé vos "
-"Préférences Système sur acquisitions \"simple\": les les lignes de crédit "
-"sont utiles uniquement quand vous utilisez les acquisitions \"normal\"."
+"Préférences Système sur acquisitions\"simple\":les lignes de crédit sont "
+"utiles uniquement quand vous utilisez les acquisitions \"normal\"."
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:12
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:130
@@ -3214,7 +3286,7 @@ msgstr ""
 msgid "Book fund"
 msgstr "Ligne de crédit"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:17
 msgid ""
 "Book fund administration. Remember to edit your book funds before you start "
@@ -3232,7 +3304,7 @@ msgstr "Nom de la ligne de cr
 msgid "Book funds"
 msgstr "Lignes de crédit"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/order.tmpl:8
 msgid "Book seller"
 msgstr "Fournisseur"
@@ -3256,7 +3328,7 @@ msgstr "Etag
 msgid "Borrower"
 msgstr "Emprunteur"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/categorie.tmpl:2
 msgid "Borrower Categories"
 msgstr "Catégories de lecteur"
@@ -3281,7 +3353,7 @@ msgstr "Le lecteur doit %s"
 msgid "Borrower has %s item(s) on issue"
 msgstr "Le lecteur a %s documents en prêt"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/deletemem.tmpl:13
 msgid "Borrower has guarantees"
 msgstr "Le lecteur a des cautions"
@@ -3290,11 +3362,11 @@ msgstr "Le lecteur a des cautions"
 msgid "Borrower information"
 msgstr "Information lecteur"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:171
+#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:180
 msgid "Borrower is debarred"
 msgstr "Le lecteur est exclu"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:165
+#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:174
 msgid "Borrower is gone with no address"
 msgstr "Le lecteur est parti sans laisser d'adresse"
 
@@ -3302,7 +3374,7 @@ msgstr "Le lecteur est parti sans laisser d'adresse"
 msgid "Borrower message (appears in OPAC)"
 msgstr "Message Lecteur (apparaît dans l'OPAC)"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:168
+#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:177
 msgid "Borrower's card is lost"
 msgstr "La carte du lecteur est perdue"
 
@@ -3323,8 +3395,8 @@ msgstr "Les lecteurs peuvent chercher par types de document"
 msgid "Branch"
 msgstr "Site"
 
-#
-#: ../../koha-tmpl/intranet-tmpl/default/en/help/search.marc/search.tmpl:14
+# 
+#: ../../koha-tmpl/intranet-tmpl/default/en/help/search.marc/search.tmpl:15
 msgid ""
 "Branch : select here a specific branch. If none selected, the search is done "
 "on every branch"
@@ -3369,7 +3441,7 @@ msgstr "Sites : Modifier Site"
 msgid "Branches: Edit Category"
 msgstr "Sites : Modifier Catégorie"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:45
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:47
 msgid "Brig C. McCoy"
 msgstr "Brig C. McCoy"
 
@@ -3378,7 +3450,7 @@ msgid "Browse Members"
 msgstr "Naviguer dans les lecteurs"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:28
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:14
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:17
 msgid "Budget"
 msgstr "Budget"
 
@@ -3432,7 +3504,7 @@ msgstr "DETAILS SOCIETE"
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:158
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl:163
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:71
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:92
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:93
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:38
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:98
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:211
@@ -3471,19 +3543,21 @@ msgstr "TOTAL"
 msgid "CURRENT STATUS"
 msgstr "ETAT ACTUEL"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl:77
 msgid "Call Number"
 msgstr "Cote"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:238
-#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:267
+#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:247
+#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:276
 #: ../../koha-tmpl/intranet-tmpl/default/en/reports/inventory.tmpl:37
+#: ../../koha-tmpl/intranet-tmpl/default/en/help/search.marc/search.tmpl:12
 msgid "Call number"
 msgstr "Cote"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:66
-msgid "Can't find inventary codes on that range. Please try again."
+#: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:65
+#
+msgid "Can't find inventory codes in that range. Please try again."
 msgstr "Numéro d'inventaire introuvable dans ces limites. Merci de rééssayer"
 
 #. INPUT type=submit
@@ -3493,8 +3567,8 @@ msgstr "Num
 msgid "Cancel"
 msgstr "Annuler"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:201
-#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:204
+#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:210
+#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:213
 msgid "Cancel Reserve"
 msgstr "Annuler réservation"
 
@@ -3512,6 +3586,7 @@ msgid "Cannot be selected"
 msgstr "Ne peut être sélectionné"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/member.tmpl:17
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/member-quicksearch-results.tmpl:10
 msgid "Card"
 msgstr "Carte"
 
@@ -3522,14 +3597,13 @@ msgstr "Carte"
 msgid "Card number"
 msgstr "Numéro de Carte"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:8
 #: ../../koha-tmpl/intranet-tmpl/default/en/auth.tmpl:37
 msgid "Card number:"
 msgstr "Numéro de Carte :"
 
-#. For the first occurrence,
 #. %1$s: TMPL_VAR name=cardnumber
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/readingrec.tmpl:5
-#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:8
 #, c-format
 msgid "Card number: %s"
 msgstr "Numéro de Carte : %s"
@@ -3627,17 +3701,12 @@ msgstr "Cat
 msgid "Change"
 msgstr "Changer"
 
-#. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:89
-msgid "Change Password"
-msgstr "Changer de mot de passe"
-
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl:59
 #, c-format
 msgid "Change status to waiting and print <a1>slip</a>?"
 msgstr "Mettre en attente et imprimer <a1>bon de prêt</a> ?"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/import/breeding.tmpl:24
 msgid "Character encoding"
 msgstr "Codage des caractères (MARC21 ou UNIMARC)"
@@ -3646,7 +3715,7 @@ msgstr "Codage des caract
 msgid "Character encoding (MARC21 or UNIMARC)"
 msgstr "Codage des caractères (MARC21 ou UNIMARC)"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:172
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:165
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl:134
 msgid "Charge"
 msgstr "Frais"
@@ -3668,7 +3737,7 @@ msgstr "Contr
 msgid "Checking MARC setup"
 msgstr "Contrôle du paramétrage MARC"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:53
 msgid ""
 "Checks the MARC structure. USE IT before working with real data. It will "
@@ -3677,6 +3746,17 @@ msgstr ""
 "Contrôle la structure MARC.A UTILISER avant de travailler avec des données "
 "réelles.Ça pointe les erreurs qui peuvent CASSER la base de données Koha"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:77
+#
+msgid "Chinese"
+msgstr "Chinois"
+
+#. INPUT type=button
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/member-quicksearch-results.tmpl:21
+#
+msgid "Choose"
+msgstr "Choisir"
+
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/import/breeding.tmpl:6
 msgid "Choose File to browse."
 msgstr "Choisir le dossier à rechercher."
@@ -3688,9 +3768,15 @@ msgstr "Choisir le dossier 
 msgid "Choose and validate 1 of the following for <b>%s.%s</b>"
 msgstr "Choisir et valider 1 des champs suivants pour <b>%s.%s</b>"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:32
+#. INPUT type=button
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/member-quicksearch-results.tmpl:21
+#
+msgid "Choose this Patron"
+msgstr "Choisir ce lecteur"
+
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:29
 msgid "Chris Cormack, 1.2 release manager"
-msgstr ""
+msgstr "Chris Cormack, responsable de la version 1.2"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-bottom.inc:9
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/about-bottom.inc:9
@@ -3710,11 +3796,16 @@ msgstr ""
 msgid "Circulation"
 msgstr "Prêt"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/circ/circulation.tmpl:2
 msgid "Circulation / Issues help"
 msgstr "Prêt/Aide des sorties"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/help/circ/returns.tmpl:2
+#
+msgid "Circulation / Returns help"
+msgstr "Prêt: Retours, aide en ligne"
+
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl:243
 msgid "Circulation note (appears during issue/return)"
 msgstr "Note de prêt (apparaît pendant les sortie/retour"
@@ -3754,9 +3845,9 @@ msgstr "Classification"
 msgid "Clear"
 msgstr "Effacer"
 
-#
+# 
 #. INPUT type=reset name=B2
-#: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:180
+#: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:174
 msgid "Clear Fields"
 msgstr "Effacer tous les champs"
 
@@ -3769,7 +3860,7 @@ msgstr "Effacer tous les champs"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/updatebiblio.tmpl:5
 msgid "Click submit to force the subject"
-msgstr "Cliquer sur soumettre pour forcer le sujet"
+msgstr "Cliquer sur valider pour forcer le sujet"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl:16
 msgid "Close"
@@ -3793,6 +3884,11 @@ msgstr "ferm
 msgid "Code"
 msgstr "Code"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:32
+#
+msgid "Collection:"
+msgstr "Collection :"
+
 #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:35
 msgid "Columns"
 msgstr "Colonnes"
@@ -3809,7 +3905,7 @@ msgstr "Soci
 msgid "Company Name"
 msgstr "Nom de Société"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/help/search.marc/search.tmpl:22
+#: ../../koha-tmpl/intranet-tmpl/default/en/help/search.marc/search.tmpl:23
 msgid "Complete MARC search"
 msgstr "Recherche MARC"
 
@@ -3819,7 +3915,8 @@ msgstr "Engag
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:127
 msgid "Configuration OK, you don't have errors in your MARC parameters table"
-msgstr "Configuration OK, il n'y pas d'erreurs dans votre table de paramètres MARC"
+msgstr ""
+"Configuration OK, il n'y pas d'erreurs dans votre table de paramètres MARC"
 
 #. INPUT type=submit
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/member-password.tmpl:13
@@ -3844,7 +3941,7 @@ msgid "Confirm deletion of %s (%s)?"
 msgstr "Confirmer la suppression de %s (%s) ?"
 
 #. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:212
+#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:221
 msgid "Confirm issue"
 msgstr "Confirmer le prêt"
 
@@ -3856,7 +3953,7 @@ msgstr "Etudier la formule <b>N
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:90
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:113
 msgid "Constraints"
-msgstr "Contraintes"
+msgstr "Restrictions"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl:41
 msgid "Contact Name"
@@ -3866,11 +3963,10 @@ msgstr "Nom du contact"
 msgid "Contact Name*"
 msgstr "Nom du contact*"
 
-#. %1$s: TMPL_VAR name=contactname
-#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:31
-#, c-format
-msgid "Contact: %s"
-msgstr "Contact : %s"
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:30
+#
+msgid "Contact:"
+msgstr "Contact :"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl:115
 msgid "Contains"
@@ -3904,7 +4000,7 @@ msgstr "Date de copyright"
 msgid "Copyright Date:"
 msgstr "Date de copyright"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem-nomarc.tmpl:17
 msgid "Copyright:"
 msgstr "Copyright"
@@ -3913,25 +4009,25 @@ msgstr "Copyright"
 msgid "Core team for 2.2"
 msgstr "Contributeurs principaux pour la version 2.2"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:13
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:16
 msgid "Cost"
 msgstr "Coût"
 
-#
-#: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:120
+# 
+#: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:119
 msgid "Country Code"
 msgstr "Code Pays"
 
 #. %1$S: type=text name=countryCode
 #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:22
 #, c-format
-msgid "Country Code&nbsp%S"
+msgid "Country Code &nbsp;%S"
 msgstr "Code pays %S"
 
 #. %1$S: type=text name=countryName
 #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:18
 #, c-format
-msgid "Country Name&nbsp%S"
+msgid "Country Name &nbsp;%S"
 msgstr "Pays %S"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbooks.tmpl:19
@@ -3940,7 +4036,7 @@ msgid "Create Empty biblio"
 msgstr "Créer une nouvelle notice"
 
 #. %1$s: TMPL_VAR name=authtypecode
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:108
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:109
 #, c-format
 msgid "Create authority framework for %s using"
 msgstr "Créer une grille d'autorité pour %s à partir de"
@@ -3968,7 +4064,7 @@ msgstr "Devises"
 msgid "Currencies admin"
 msgstr "Gestion des devises"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/currency.tmpl:2
 msgid "Currencies administration"
 msgstr "Gestion des devises"
@@ -3989,13 +4085,13 @@ msgstr "Nom de devise manquant"
 msgid "DETAILS"
 msgstr "DETAILS DU CONTACT"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:46
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:48
 msgid "Daniel Holth"
 msgstr "Daniel Holth"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:164
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl:172
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:98
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:99
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:222
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:233
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/currency.tmpl:144
@@ -4006,7 +4102,7 @@ msgstr "Daniel Holth"
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl:131
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl:186
 msgid "Data deleted"
-msgstr "Donnée détruite"
+msgstr "Donnée supprimée"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:147
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl:134
@@ -4033,12 +4129,15 @@ msgid "Date"
 msgstr "Date"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail-opac.tmpl:43
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:45
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:61
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember-receipt.tmpl:12
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember-receipt.tmpl:28
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember-print.tmpl:19
 #: ../../koha-tmpl/intranet-tmpl/default/en/modbibitem.tmpl:78
 msgid "Date Due"
 msgstr "Date de retour"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/readingrec.tmpl:21
 msgid "Date due"
 msgstr "Date de retour"
@@ -4065,17 +4164,17 @@ msgstr "Date de naissance"
 msgid "Date/time"
 msgstr "Date/heure"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem-nomarc.tmpl:24
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem-nomarc.tmpl:32
 msgid "Date:"
 msgstr "Date"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:47
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:49
 msgid "David Strainchamps"
 msgstr "David Strainchamps"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:73
+#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:82
 msgid "Day"
 msgstr "Jour"
 
@@ -4088,16 +4187,21 @@ msgstr "Jour"
 #: ../../koha-tmpl/intranet-tmpl/default/en/suggestion/mail_suggestion_REJECTED.tmpl:1
 #, c-format
 msgid "Dear %s user, You have suggested that the library acquire %s"
-msgstr "Cher lecteur %s, vous avez fait à la bibliothèque la suggestion d'achat de %s"
+msgstr ""
+"Cher lecteur %s, vous avez fait à la bibliothèque la suggestion d'achat de %s"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:119
+#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:48
+msgid "Debarred:"
+msgstr "Suspendu"
+
+#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:128
 msgid "Dec"
 msgstr "Dec"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbooks.tmpl:24
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/isbnsearch.tmpl:96
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:110
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:125
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:111
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:126
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/issuingrules.tmpl:29
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:106
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:121
@@ -4113,7 +4217,7 @@ msgstr "Grille par d
 msgid "Default values"
 msgstr "Valeurs par défaut"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:114
 msgid ""
 "Define authority types, then authority MARC structure in the same way you "
@@ -4125,7 +4229,7 @@ msgstr ""
 "champs MARC biblio.Les valeurs des autorités sont gérées par des modules "
 "d'extension"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:37
 msgid ""
 "Define categories and authorised values for them. Authorised values are used "
@@ -4137,13 +4241,13 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:41
 msgid "Define categories and thesaurus/authority MARC structure."
-msgstr "Définir des catégories et les structures  des autorités MARC "
+msgstr "Définir des catégories et les structures  des autorités MARC"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:21
 msgid "Define exchange rates."
 msgstr "Définir des taux de change"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:33
 msgid ""
 "Define issuing rules for branches / borrowers / item types (nb of issues, "
@@ -4156,7 +4260,7 @@ msgstr ""
 msgid "Define item types."
 msgstr "Définir des types de documents"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:49
 msgid ""
 "Define links between the Koha standard DB and the MARC one. Note those links "
@@ -4171,10 +4275,10 @@ msgstr ""
 msgid "Define the categories of borrowers."
 msgstr "Définir les catégories de lecteurs"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/currency.tmpl:3
 msgid "Define the currencies you deal with here."
-msgstr "Définir les catégories de lecteurs"
+msgstr "Définir les devises que vous utilisez ici."
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:53
 msgid "Define the page size for output the PDF."
@@ -4182,7 +4286,8 @@ msgstr "D
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/z3950servers.tmpl:3
 msgid "Defines the Z39.50 servers you want Koha to search."
-msgstr "Détermine les serveurs Z3950 sur lesquels vous voulez que Koha cherche."
+msgstr ""
+"Détermine les serveurs Z3950 sur lesquels vous voulez que Koha cherche."
 
 #. %1$s: TMPL_VAR name=branch
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/issuingrules.tmpl:3
@@ -4194,13 +4299,11 @@ msgstr "D
 msgid "Del"
 msgstr "Sup"
 
-#. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:85
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:15
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:24
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:48
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:91
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:146
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:147
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:59
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:123
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:154
@@ -4233,17 +4336,22 @@ msgstr "Supprimer des 
 msgid "Delete a request by selecting \"del\" from the rank list."
 msgstr "Supprimer une réservation en sélectionnant"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:9
+#
+msgid "Delete subscription"
+msgstr "Supprimer l'abonnement"
+
 #. INPUT type=submit name=delete
 #: ../../koha-tmpl/intranet-tmpl/default/en/modwebsites.tmpl:25
 msgid "Delete this Website link"
 msgstr "Supprimer le lien vers ce site web"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/deletemem.tmpl:5
 msgid "Deletion impossible"
 msgstr "Suppression impossible"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:54
 msgid ""
 "Depending on page size, Koha will show you how the page is arranged for each "
@@ -4286,7 +4394,7 @@ msgstr "Description manquante"
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/cmsdsearchresults.tmpl:7
 #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl:31
 #: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl:142
-#: ../../koha-tmpl/intranet-tmpl/default/en/help/search.marc/search.tmpl:12
+#: ../../koha-tmpl/intranet-tmpl/default/en/help/search.marc/search.tmpl:11
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/search.tmpl:32
 msgid "Dewey"
 msgstr "Dewey"
@@ -4298,6 +4406,7 @@ msgstr "sous-classification Dewey"
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem-nomarc.tmpl:29
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem-nomarc.tmpl:88
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/catalogue-home.tmpl:23
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:40
 msgid "Dewey:"
 msgstr "Dewey :"
 
@@ -4323,7 +4432,7 @@ msgid ""
 msgstr ""
 "Ne vous attendez pas à avoir chaque table de Koha reliée à un sous-champ "
 "MARC.Quelques unes (comme le numéro de notice, le numéro d'exemplaire) sont "
-"des valeurs générées par Koha et seront probablement automatiquement reliés."
+"des valeurs générées par Koha et seront probablement automatiquement reliés. "
 "Les autres sont des messages qui sont activés lors du déroulement des "
 "activités de prêt normales et contiendront des informations qui ne font pas "
 "partie de votre notice MARC."
@@ -4333,30 +4442,29 @@ msgstr ""
 msgid "Do you confirm item deletion?"
 msgstr "Confirmez-vous la suppression de l exemplaire ?"
 
-#. %1$s: TMPL_VAR name=dateofbirth
-#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:27
-#, c-format
-msgid "DoB: %s"
-msgstr "D.nais:%s"
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:26
+#
+msgid "DoB:"
+msgstr "Date de naissance"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:213
+#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:222
 msgid "Don't issue"
 msgstr "Ne pas préter"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:48
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:50
 msgid "Dorian Meid (German translation)"
-msgstr ""
+msgstr "Dorian Meid (traduxtion allemande)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl:76
 msgid "Dr"
 msgstr "Dr"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:170
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:163
 msgid "Due"
 msgstr "Retour"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:234
-#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:263
+#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:243
+#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:272
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl:183
 #: ../../koha-tmpl/intranet-tmpl/default/en/overdue.tmpl:7
 msgid "Due Date"
@@ -4379,11 +4487,10 @@ msgstr "Mail"
 msgid "E-mail Address"
 msgstr "adresse e-mail"
 
-#. %1$s: TMPL_VAR name=emailaddress
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:14
-#, c-format
-msgid "E-mail: <a1>%s</a>"
-msgstr "Mail : <a1>%s</a>"
+#
+msgid "E-mail:"
+msgstr "Mail"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl:15
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/newmember.tmpl:229
@@ -4402,8 +4509,8 @@ msgid ""
 "above) and enter the code in the \"Book fund\" box, then a full name in the "
 "\"Name\" box."
 msgstr ""
-"Chaque ligne de crédit un code unique, limité à cinq caractères, qui "
-"l'identifient.Vous devrez choisir vos codes (par exemple LIVRE, REVUE, BANQ, "
+"Chaque ligne de crédit a un code unique, limité à cinq caractères, qui "
+"l'identifie.Vous devrez choisir vos codes (par exemple LIVRE, REVUE, BANQ, "
 "pour les lignes de crédit décrites ci-dessus), puis saisir ce code dans le "
 "champ \"Code crédit\", et le nom complet dans le champ \"Nom\"."
 
@@ -4434,8 +4541,8 @@ msgid ""
 "the number of days set by the final number in the grid and sets the charge "
 "to the maximum, which is 5."
 msgstr ""
-"Chaque pavé de la grille contient 3 nombres séparés par de virgules, "
-"définissants les amendes, à partir de combien de jours de retard une amende "
+"Chaque pavé de la grille contient 3 nombres séparés par ded virgules, "
+"définissant les amendes, à partir de combien de jours de retard une amende "
 "est exigible et une première réclamation préparée (le \"délai de grâce\"), "
 "et combien de jours après une nouvelle amende est-elle exigible et une "
 "seconde réclamation envoyée. Par exemple si vous pénalisez les adultes de 1 "
@@ -4444,12 +4551,12 @@ msgstr ""
 "supplémentaires, entrez \"1,3,5\"dans le pavé en face de \"Adulte\" et de "
 "\"Video.\"Si vous pénalisez les adultes de 25 centimes pour les livres de "
 "fiction à partir de 7 jours de retard et que vous renouvellez l'amende 7 "
-"jours plus tard, alors la saisie dans les pavés de grille correspondants sera"
-"\".25,7,7\".Lorsque le premier et le second dépassés sont envoyés, Koha "
-"prépare un \"avertiseement\"au bout du nombre de jours défini par le chiffre "
+"jours plus tard, alors la saisie dans les pavés de grille correspondants "
+"sera \".25,7,7\".Lorsque le premier et le second dépassés sont envoyés, Koha "
+"prépare un \"avertissement\"au bout du nombre de jours défini par le chiffre "
 "final dans la grille et fixe l'amende au maximum qui est de 5."
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/issuingrules.tmpl:9
 #: ../../koha-tmpl/intranet-tmpl/default/en/charges.tmpl:6
 msgid ""
@@ -4460,7 +4567,8 @@ msgstr ""
 "charges"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/issuingrules.tmpl:6
-msgid "Each box needs to be filled in with issuelength,maxissues"
+#
+msgid "Each box needs to be filled with issuelength, maxissues"
 msgstr "Remplir chaque pavé  avec la durée du prêt, le nombre maximum de prêts"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/cat-class-list.inc:5
@@ -4471,15 +4579,15 @@ msgstr "Facile/livres d'images"
 msgid "Easy Reader"
 msgstr "Lecteur débutant"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:50
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:52
 msgid "Ed Summers (Some code and Perl packages like MARC::Record)"
-msgstr ""
+msgstr "Ed Summers (Codes et paquetages Perl tels que Enregistrement::MARC)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl:94
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:14
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:22
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:43
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:145
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:146
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:58
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:122
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:147
@@ -4503,11 +4611,11 @@ msgstr "Editer l'institution"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:10
 msgid "Edit MARC subfields constraints"
-msgstr "Ouvrir les contraintes des sous-champs MARC"
+msgstr "Editer les restrictions des sous-champs MARC"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:8
 msgid "Edit subfields"
-msgstr "Ouvrir les sous-champs"
+msgstr "Editer les sous-champs"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/isbnsearch.tmpl:29
 msgid "Edit..."
@@ -4515,6 +4623,7 @@ msgstr "Ouvrir"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/marctagstructure.tmpl:8
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/marc_subfields_structure.tmpl:8
+#
 msgid ""
 "Editing the SubFields from the MARC tag structure page is very time-"
 "consuming, but also very important; be sure to click the subfield link for "
@@ -4527,7 +4636,7 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:28
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:31
 msgid "Editor constaints"
-msgstr "Editeur des contraintes"
+msgstr "Editeur des restrictions"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/imemberentry.tmpl:78
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl:184
@@ -4540,6 +4649,15 @@ msgstr "Mail"
 msgid "Email: %s"
 msgstr "Mail: %s"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:33
+msgid ""
+"Emiliano Marmonti, Matías Veleda & Sebastian Catañeda <b>La Plata "
+"University, Argentina</b> (barcode printing)"
+msgstr ""
+"Emiliano Marmonti, Matías Veleda & Sebastian Catañeda <b>La Plata "
+"University, Argentina</b> (Impression codes-barres)"
+
+
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl:14
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl:157
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl:77
@@ -4558,7 +4676,7 @@ msgstr "Anglais"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/categorie.tmpl:20
 msgid "Enrollment Fee and Reserve Fee"
-msgstr ""
+msgstr "Droits d'inscription et frais de réservation"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/categorie.tmpl:21
 msgid ""
@@ -4572,7 +4690,7 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/categorie.tmpl:14
 msgid "Enrollment Period"
-msgstr "Période d'inscription"
+msgstr "Durée d'inscription"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:117
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:187
@@ -4584,7 +4702,7 @@ msgstr "Frais d'inscription"
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:175
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:253
 msgid "Enrollment period"
-msgstr "Période d'inscription"
+msgstr "Durée d'inscription"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/categorie.tmpl:15
 msgid ""
@@ -4611,9 +4729,9 @@ msgstr "Frais d'inscription"
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:96
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:178
 msgid "Enrolment period"
-msgstr "Période d'inscription"
+msgstr "Durée d'inscription"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:69
+#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:78
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl:97
 msgid "Enter Book Barcode"
 msgstr "Entrez le code à barres du livre"
@@ -4624,23 +4742,23 @@ msgstr ""
 "Entrer un(des) codes-barre et un site, si vous souhaitez ajouter un(des) "
 "exemplaires maintenant"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:50
+#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:59
 msgid "Enter borrower card number or partial last name"
 msgstr "entrer le n° de carte de lecteur ou une partie du nom"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/errors/401.tmpl:9
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/401.tmpl:5
 msgid "Error 401"
 msgstr "Erreur 401"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/errors/400.tmpl:9
-#: ../../koha-tmpl/intranet-tmpl/default/en/errors/402.tmpl:9
-#: ../../koha-tmpl/intranet-tmpl/default/en/errors/403.tmpl:9
-#: ../../koha-tmpl/intranet-tmpl/default/en/errors/404.tmpl:9
-#: ../../koha-tmpl/intranet-tmpl/default/en/errors/405.tmpl:9
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/400.tmpl:5
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/402.tmpl:5
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/403.tmpl:5
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/404.tmpl:5
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/405.tmpl:5
 msgid "Error 404"
 msgstr "Erreur 404"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/errors/500.tmpl:9
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/500.tmpl:5
 msgid "Error 500"
 msgstr "Erreur 500"
 
@@ -4650,6 +4768,11 @@ msgstr "Erreur 500"
 msgid "Error : %s"
 msgstr "Erreur : %s"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:53
+#
+msgid "Esiee School (Jérome Vizcaino, Michel Lerenard, Pierre Cauchois)"
+msgstr "Esiee (Jérome Vizcaino, Michel Lerenard, Pierre Cauchois)"
+
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl:120
 msgid "Ethnicity"
 msgstr "Ethnie"
@@ -4658,12 +4781,10 @@ msgstr "Ethnie"
 msgid "Ethnicity Notes"
 msgstr "Note d'ethnie"
 
-#. %1$s: TMPL_VAR name=ethnicity
-#. %2$s: TMPL_VAR name=ethnotes
-#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:24
-#, c-format
-msgid "Ethnicity: %s, %s"
-msgstr "Ethnie : %s, %s"
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:23
+#
+msgid "Ethnicity:"
+msgstr "Ethnie"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/members/memberentry.tmpl:5
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/members/memberentry.tmpl:12
@@ -4671,10 +4792,12 @@ msgid ""
 "Every field with an asterisk must be filled out, or you will get an error, "
 "and the record will not be added to the database."
 msgstr ""
+"Tous les champs avec astérique doivent être remplis, ou bien vous aurez une "
+"erreur, et l'enregistrement ne pourra pas être ajouté à la base de données."
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem.tmpl:11
 msgid "Existing items"
-msgstr "Documents existants"
+msgstr "Exemplaires existants"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/newmember.tmpl:66
 msgid "Expiry Date"
@@ -4685,15 +4808,11 @@ msgid "Explanation"
 msgstr "Explication"
 
 #. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/default/en/export/marc.tmpl:10
+#: ../../koha-tmpl/intranet-tmpl/default/en/export/marc.tmpl:13
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:79
 msgid "Export"
 msgstr "Exportation"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/export/marc.tmpl:5
-msgid "Export in MARC format the following biblios :"
-msgstr "Exporter au format MARC les notices suivantes :"
-
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:83
 msgid "Exporting in MARC format."
 msgstr "Exporter au format MARC."
@@ -4724,15 +4843,18 @@ msgstr "Autorisations pour %s, %s"
 msgid "Fax"
 msgstr "Fax"
 
-#. For the first occurrence,
-#. %1$s: TMPL_VAR name=faxnumber
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:13
+#
+msgid "Fax:"
+msgstr "Fax"
+
+#. %1$s: TMPL_VAR name=branchfax
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:129
 #, c-format
 msgid "Fax: %s"
 msgstr "Fax: %s"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:109
+#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:118
 msgid "Feb"
 msgstr "Fév."
 
@@ -4741,10 +4863,6 @@ msgstr "F
 msgid "Fee"
 msgstr "Droit d'inscription"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:18
-msgid "Fee: $30/year, Paid"
-msgstr "Droit d'inscription : 30 €/an, payé"
-
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/newmember.tmpl:101
 msgid "Female"
 msgstr "Féminin"
@@ -4765,13 +4883,13 @@ msgstr ""
 "Remplissez ces tables dans l'ordre où elles apparaissent pour que Koha "
 "fonctionne"
 
-#
+# 
 #. INPUT type=submit
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/currency.tmpl:154
 msgid "Filter"
 msgstr "filtre"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/histsearch.tmpl:17
 msgid "Filter on"
 msgstr "Filtrer sur"
@@ -4784,7 +4902,6 @@ msgstr "Filtrer sur"
 msgid "Filter on : title: %S author: %S publisher: %S"
 msgstr "Filtre sur : titre : %S auteur : %S éditeur : %S"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:257
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:258
 #: ../../koha-tmpl/intranet-tmpl/default/en/maninvoice.tmpl:11
 msgid "Fine"
@@ -4795,7 +4912,7 @@ msgstr "Amende"
 msgid "Fine type"
 msgstr "Type d'amende"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:98
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:91
 msgid "Fines &amp; charges"
 msgstr "Dettes & amendes"
 
@@ -4808,10 +4925,11 @@ msgstr ""
 "l'enregistrement MARC que vous avez sélectionné pour votre document.Cliquez"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/member.tmpl:19
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/member-quicksearch-results.tmpl:12
 msgid "Firstname"
 msgstr "Prénom"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:60
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:76
 msgid "Fix Itemtype"
 msgstr "Déterminer le type de document"
 
@@ -4819,7 +4937,7 @@ msgstr "D
 msgid "Flags"
 msgstr "Autorisations"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:52
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:54
 msgid "Florian Bischof"
 msgstr "Florian Bischof"
 
@@ -4884,6 +5002,8 @@ msgstr "Formulaire non soumis 
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl:26
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl:115
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember-print.tmpl:18
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember-print.tmpl:43
 msgid "Format"
 msgstr "Format"
 
@@ -4908,7 +5028,7 @@ msgstr "Grille pour %s (%s)"
 msgid "Framework type"
 msgstr "Type de grille"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:53
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:55
 msgid "Francisco M. Marzoa Alonso"
 msgstr "Francisco M. Marzoa Alonso"
 
@@ -4933,6 +5053,7 @@ msgid "Freight"
 msgstr "Frais de port"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/user/userpage.tmpl:40
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:76
 msgid "French"
 msgstr "Français"
 
@@ -4940,14 +5061,14 @@ msgstr "Fran
 msgid "Frequency (*)"
 msgstr "Fréquence (*)"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:21
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:24
 msgid "Frequency (*):"
 msgstr "Fréquence (*) :"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:60
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:114
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:116
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:70
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:73
 msgid "Friday"
 msgstr "Vendredi"
 
@@ -4955,8 +5076,8 @@ msgstr "Vendredi"
 msgid "From"
 msgstr "De"
 
-#
-#: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:85
+# 
+#: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:84
 msgid "From:"
 msgstr "De"
 
@@ -4970,7 +5091,7 @@ msgstr "Nom"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/readingrec.tmpl:9
 msgid "Full output"
-msgstr "Sortie complète"
+msgstr "Totalité des emprunts"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl:34
 #, c-format
@@ -4998,30 +5119,31 @@ msgstr "Sexe"
 msgid "General Notes"
 msgstr "Remarques Générales"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:59
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:58
 msgid "General Notes:"
 msgstr "Remarques Générales :"
 
-#
+# 
 #. INPUT type=submit name=B1
-#: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:177
+#: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:171
 msgid "Generate Barcodes"
 msgstr "Générer les codes barres"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:96
 msgid "Generate barcodes"
 msgstr "Générer les codes barres"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:47
-msgid "Generate barcodes from inventary codes"
+#
+msgid "Generate barcodes from inventory codes"
 msgstr "Générer le code à barres à partir du numéro d'inventaire"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/user/userpage.tmpl:41
 msgid "German"
 msgstr "Allemand"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/order.tmpl:14
 msgid "Get It !"
 msgstr "Le choisir"
@@ -5034,6 +5156,10 @@ msgstr "Le choisir"
 msgid "Get it!"
 msgstr "Le choisir"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:79
+msgid "Giuseppe Angilella"
+msgstr "Giuseppe Angilella"
+
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/jmemberentry.tmpl:61
 msgid "Given Name*"
 msgstr "Prénom*"
@@ -5048,14 +5174,14 @@ msgstr "Pr
 msgid "Given Names*"
 msgstr "Prénoms"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:54
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:56
 msgid "Glen Stewart"
 msgstr "Glen Stewart"
 
 #. INPUT type=submit
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbooks.tmpl:16
 msgid "Go"
-msgstr "Aller"
+msgstr "Lancer"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl:60
 #, c-format
@@ -5074,17 +5200,19 @@ msgstr "Maintenance des groupes"
 msgid "Group:"
 msgstr "Groupe"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:47
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:46
 msgid "Guarantees:"
 msgstr "Caution pour"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:49
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:48
 msgid "Guarantor:"
 msgstr "Garant"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:34
-msgid "Gynn Lomax, Richard Anderson, Jeremy Blake, Rebecca Holden, Olive T. Canine"
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:31
+msgid ""
+"Gynn Lomax, Richard Anderson, Jeremy Blake, Rebecca Holden, Olive T. Canine"
 msgstr ""
+"Gynn Lomax, Richard Anderson, Jeremy Blake, Rebecca Holden, Olive T. Canine"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl:66
 msgid "HELP"
@@ -5162,7 +5290,7 @@ msgstr ""
 msgid "Help"
 msgstr "Aide"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:55
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:57
 msgid "Henri-Damien Laurent"
 msgstr "Henri Damien Laurent"
 
@@ -5210,13 +5338,10 @@ msgstr "Accueil"
 msgid "Home Address"
 msgstr "Adresse domicile"
 
-#. %1$s: TMPL_VAR name=physstreet
-#. %2$s: TMPL_VAR name=homezipcode
-#. %3$s: TMPL_VAR name=streetcity
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:10
-#, c-format
-msgid "Home Address: %s, %s %s"
-msgstr "Adresse domicile : %s, %s %s"
+#
+msgid "Home Address:"
+msgstr "Adresse domicile"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/moditem.tmpl:16
 msgid "Home Branch"
@@ -5233,11 +5358,11 @@ msgstr "Site d'affectation:"
 msgid "Hostname"
 msgstr "Nom du serveur hôte"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:179
+#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:188
 msgid "I need confirmation before issuing"
 msgstr "J'ai besoin de confirmation avant de prêter"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/authtypes.tmpl:14
 msgid "IMPORTANT"
 msgstr "REMARQUE IMPORTANTE :"
@@ -5250,10 +5375,10 @@ msgid ""
 msgstr ""
 "IMPORTANT : Cet outil n'est PAS prévu pour importer de l' iso2709 dans votre "
 "Base de Données ACTIVE.Si vous avez besoin de migrer des données à partir "
-"d'un autre SIGB, alors vous devez utiliser $kohaInstall/scripts/misc/"
-"bulkmarcimport.pl "
+"d'un autre SIGB, alors vous devez utiliser $kohaInstall/scripts/misc/ "
+"bulkmarcimport.pl"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/help/search.marc/search.tmpl:25
+#: ../../koha-tmpl/intranet-tmpl/default/en/help/search.marc/search.tmpl:26
 msgid "IMPORTANT NOTE :"
 msgstr "REMARQUE IMPORTANTE :"
 
@@ -5287,6 +5412,7 @@ msgstr "DETAILS COLLECTIVITE"
 #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl:28
 #: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl:85
 #: ../../koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl:17
+#: ../../koha-tmpl/intranet-tmpl/default/en/help/search.marc/search.tmpl:13
 #: ../../koha-tmpl/intranet-tmpl/default/en/modbibitem.tmpl:41
 msgid "ISBN"
 msgstr "ISBN"
@@ -5307,6 +5433,7 @@ msgstr "ISBN :<i>%s</i>"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem-nomarc.tmpl:28
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem-nomarc.tmpl:82
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:31
 msgid "ISBN:"
 msgstr "ISBN :"
 
@@ -5319,13 +5446,15 @@ msgstr "ISSN"
 msgid "ISSN:"
 msgstr "ISSN :"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/marcimport.tmpl:48
-msgid "If ISBN already in breeding farm:"
+# 
+#: ../../koha-tmpl/intranet-tmpl/default/en/import/breeding.tmpl:27
+msgid "If ISBN already in reservoir"
 msgstr "Si l'ISBN est déjà dans le réservoir"
 
+# 
+#: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/marcimport.tmpl:48
 #
-#: ../../koha-tmpl/intranet-tmpl/default/en/import/breeding.tmpl:27
-msgid "If ISBN already in reservoir"
+msgid "If ISBN is already in the reservoir:"
 msgstr "Si l'ISBN est déjà dans le réservoir"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/issuingrules.tmpl:16
@@ -5334,21 +5463,23 @@ msgstr ""
 "Si une cellule n'est pas renseignée, la première des valeurs suivantes est "
 "recherchée :"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/marcimport.tmpl:23
 #: ../../koha-tmpl/intranet-tmpl/default/en/import/breeding.tmpl:17
+#
 msgid ""
-"If an ISBN already exists in the breeding farm, you can choose whether to "
-"ignore the new one or overwrite the old one."
+"If an ISBN already exists in the reservoir, you can choose whether to ignore "
+"the new one or overwrite the old one."
 msgstr ""
 "Si un ISBN existe déjà dans le réservoir, vous pouvez choisir soit d'ignorer "
 "le nouveau soit d'écraser l'ancien."
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/issuingrules.tmpl:22
 msgid "If nothing is set, default is 21,5 (hardcoded)"
-msgstr "Si rien n'est défini, la valeur par defaut est 21,5 (figé dans le code)"
+msgstr ""
+"Si rien n'est défini, la valeur par defaut est 21,5 (figé dans le code)"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbooks.tmpl:36
 msgid ""
 "If the ISBN or title is found in the biblio table, it will be retrieved and "
@@ -5357,11 +5488,12 @@ msgstr ""
 "Si l'ISBN ou le titre est trouvé dans la table il peut être récupéré puis "
 "modifié"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbooks.tmpl:37
+#
 msgid ""
-"If the ISBN or title is found in the breeding farm, it will be retrieved and "
-"a biblio will be added."
+"If the ISBN or title is found in the reservoir, it will be retrieved and a "
+"biblio will be added."
 msgstr ""
 "Si l'ISBN ou le titre est trouvé dans le réservoir, il sera récupéré et une "
 "notice sera rajoutée"
@@ -5390,12 +5522,12 @@ msgstr ""
 "vraiment impossible (par exemple le code à barres n'existe pas), alors vous "
 "ne pouvez pas le confirmer.Si le prêt est possible mais nécessite "
 "confirmation (comme pour un document prêté à un autre lecteur, ou un lecteur "
-"ayant emprunté trop de docuements), vous pourrz alors confirmer le prêt.Si "
+"ayant emprunté trop de documents), vous pourrez alors confirmer le prêt.Si "
 "la confirmation implique une autre opération (si le document est prêté à un "
-"autre lecteur, le prêté implique que le retour soir fait), alors elle sera "
+"autre lecteur, le prêter implique que le retour soit fait), alors elle sera "
 "aussi effectuée."
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/help/circ/returns.tmpl:7
+#: ../../koha-tmpl/intranet-tmpl/default/en/help/circ/returns.tmpl:8
 msgid ""
 "If the item has been requested by someone else, you also are asked to "
 "validate the request. If you confirm it, item is changed to a \"waiting\" "
@@ -5403,10 +5535,10 @@ msgid ""
 msgstr ""
 "Si le document a été réservé par quelqu'un d'autre, on vous demandera aussi "
 "de valider la réservation.Si vous la confirmez, le document est mis à l'état "
-"\"en attente\" et vous devrez avertir le lecteur que le docuement est "
+"\"en attente\" et vous devrez avertir le lecteur que le document est "
 "disponible."
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/help/circ/returns.tmpl:8
+#: ../../koha-tmpl/intranet-tmpl/default/en/help/circ/returns.tmpl:9
 msgid ""
 "If the item is requested by someone in anothe branch, then you must validate "
 "the transfer too"
@@ -5421,6 +5553,11 @@ msgid ""
 "their cards or when children forget their cards. That way, you can avoid "
 "having multiple numbers for the same patron."
 msgstr ""
+"S'il y a déjà un lecteur correspondant au nom que vous cherchez, il sera "
+"affiché quand vous aurez cliquer sur OK.Cela peut-être particulièrement "
+"pratique lorque quelqu'un a perdu sa carte ou lorsqu'un enfant a oublié la "
+"sienne.De cette façon vous pouvez éviter d'avoir plusieurs numéros pour le "
+"même lecteur."
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/members/memberentry.tmpl:6
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/members/memberentry.tmpl:13
@@ -5428,6 +5565,9 @@ msgid ""
 "If you accidentally have two members with the same card number, the second "
 "duplicate will show up as just commas after you confirm the record."
 msgstr ""
+"Si par erreur vous avez deux lecteurs avec le même numéro de carte, le "
+"double s'affichera sous forme de virgules lorque vous aurez confirmé "
+"l'enregistrement"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/marctagstructure.tmpl:6
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/marc_subfields_structure.tmpl:6
@@ -5475,7 +5615,7 @@ msgstr ""
 msgid "If you change a link here, EVERY framework will be modified."
 msgstr "Si vous changez un lien ici, TOUTES les grilles seront modifiées."
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/koha2marclinks.tmpl:160
 msgid ""
 "If you change the link between a MARC subfield and a non-MARC field, ask "
@@ -5484,8 +5624,8 @@ msgstr ""
 "Si vous changez un lien entre un sous-champ MARC et un champ non-MARC, "
 "demandez à votre administrateur de lancer le script misc/rebuildnonmarc.pl."
 
-#
-#: ../../koha-tmpl/intranet-tmpl/default/en/help/search.marc/search.tmpl:20
+# 
+#: ../../koha-tmpl/intranet-tmpl/default/en/help/search.marc/search.tmpl:21
 msgid ""
 "If you enter a * (or a %) at the end of a term, Koha search for words "
 "starting with your term (entering"
@@ -5493,8 +5633,8 @@ msgstr ""
 "Si vous saisissez un * (ou un %) à la fin d'un terme, Koha recherche les "
 "mots qui commencent par le terme saisi"
 
-#
-#: ../../koha-tmpl/intranet-tmpl/default/en/help/search.marc/search.tmpl:18
+# 
+#: ../../koha-tmpl/intranet-tmpl/default/en/help/search.marc/search.tmpl:19
 msgid ""
 "If you enter values in more than 1 field, the search is \"and-ed\" (biblios "
 "that contains <b>title</b> AND <b>author</b>)"
@@ -5503,6 +5643,7 @@ msgstr ""
 "notices contenant <b>titre</b> ET <b>auteur</b>)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/z3950servers.tmpl:9
+#
 msgid ""
 "If you have a login name and password for other Z39.50 servers, Koha will "
 "save your user ID and password in addition to the other information it needs "
@@ -5513,10 +5654,10 @@ msgid ""
 msgstr ""
 "Si vous avez un nom d'ouverture de session, et un mot de passe pour d'autres "
 "serveurs z3950, Koha sauvera  votre identification d'utilisateur et mot de "
-"passe en plus des autres informations dont il a besoin pour se connecter."
+"passe en plus des autres informations dont il a besoin pour se connecter. "
 "(Pour les serveurs anonymes, laissez les champs identifiant et  mot de passe "
 "en blanc.)Les autres champs du formulaire commandent si le serveur cherche "
-"automatiquement ou non quand vous lancer une requête z3950 (Mettre un \"1"
+"automatiquement ou non quand vous lancer une requête z3950 (Mettre un \"1 "
 "\"dans le champ \"Checked\" et l'ordre dans lequel il sera contrôlé."
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/bull-home.tmpl:4
@@ -5542,12 +5683,18 @@ msgid ""
 "the lower left. A confirmation box will appear, so don't worry about "
 "accidentally deleting a record. Just be absolutely sure before you delete!"
 msgstr ""
+"Si vous voulez supprimer un lecteur DEFINITIVEMENT, cliquez sur le bouton de "
+"suppression en bas à gauche.Une boîte de confirmation apparaîtra, de cette "
+"façon pas de crainte de supprimer un enregistrement par accident.Soyez "
+"seulement complètment sûr avant de supprimer."
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/members/moremember.tmpl:10
 msgid ""
 "If you would like to edit a patron's information, click the modify button on "
 "the lower left."
 msgstr ""
+"Si vous souhaitez modifier des informations sur le lecteur, cliquez sur le "
+"bouton modifier en bas à gauche."
 
 #. INPUT type=submit
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/branchtransfers.tmpl:72
@@ -5558,7 +5705,7 @@ msgstr "Ignorer"
 msgid "Ignore and return to transfers:"
 msgstr "Ignorer et retourner à transferts :"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/import/breeding.tmpl:8
 msgid "Ignore this one, keep the existing one."
 msgstr "Ignorer celui-ci, garder l'existant"
@@ -5568,7 +5715,6 @@ msgid "Illustrations"
 msgstr "Illustrations"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl:18
-#: ../../koha-tmpl/intranet-tmpl/default/en/help/search.marc/search.tmpl:11
 msgid "Illustrator"
 msgstr "Illustrateur"
 
@@ -5584,17 +5730,19 @@ msgstr "Illustrateur:"
 msgid "Import"
 msgstr "Importer"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl:130
 msgid "Import in reservoir"
 msgstr "Importer dans le réservoir"
 
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/marcimport.tmpl:6
 #: ../../koha-tmpl/intranet-tmpl/default/en/import/breeding.tmpl:3
-msgid "Import into the breeding farm"
+#
+msgid "Import into the reservoir"
 msgstr "Importer dans le réservoir"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/import/breeding.tmpl:2
 msgid "Import iso2709 file"
 msgstr "Importer cette notice"
@@ -5608,18 +5756,20 @@ msgstr "R
 msgid "Import this biblio"
 msgstr "Importer cette notice"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/acqui/newbasket2.tmpl:58
-msgid "In Transit"
-msgstr "En transit"
-
+# 
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/500.tmpl:8
 #
-#: ../../koha-tmpl/intranet-tmpl/default/en/errors/500.tmpl:15
-msgid "In koha this typically mean that the koha-team is working on a new options"
+msgid ""
+"In Koha this typically means that the Koha team is working on new features"
 msgstr ""
 "Dans Koha, ceci signifie normalement, que l'équipe de Koha travaille à de "
 "nouvelles options"
 
-#
+#: ../../koha-tmpl/intranet-tmpl/default/en/acqui/newbasket2.tmpl:58
+msgid "In Transit"
+msgstr "En transit"
+
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/authtypes.tmpl:16
 msgid ""
 "In the biblio framework, the reported tag <b>MUST</b> contain a $9 subfield, "
@@ -5632,20 +5782,23 @@ msgstr ""
 "sous champ devrait logiquement avoir la case \"caché\" cochée, mais ce n'est "
 "pas obligatoire"
 
-#
-#: ../../koha-tmpl/intranet-tmpl/default/en/help/search.marc/search.tmpl:23
+# 
+#: ../../koha-tmpl/intranet-tmpl/default/en/help/search.marc/search.tmpl:24
 msgid ""
 "In the lower part of the search screen, the <b>More fields</b> box let you "
 "enter whatever you want : and, or, exclusions (not), search on any MARC "
 "field/subfield"
 msgstr ""
-"Dans la partie inférieure de l'écran de recherche, le pavé <b>Plus de "
-"champs</b>, vous permet de saisir ce que vous voulez  :  et, ou, non "
-"(exclusions), recherche sur tous les champs/sous-champs MARC"
+"<b>Plus de champs</b>, vous permet de saisir ce que vous voulez : et, ou, "
+"non (exclusions), recherche sur tous les champs/sous-champs MARC'>En bas de "
+"l'écran de recherche, le pavé <b>Plus de champs</b>, vous permet de saisir "
+"ce que vous voulez : et, ou, non (exclusions), recherche sur tous les champs/"
+"sous-champs MARC"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-detail.tmpl:3
-msgid "In this screen, you can see subscription detail, and modify it if you need."
+msgid ""
+"In this screen, you can see subscription detail, and modify it if you need."
 msgstr ""
 "Sur cet écran, vous pouvez voir le détail de l'abonnement, et le modifier si "
 "nécessaire."
@@ -5683,9 +5836,10 @@ msgstr "N
 msgid "Invalid cardnumber."
 msgstr "N° de carte invalide."
 
+# 
+#: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:97
 #
-#: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:98
-msgid "Inventary Code"
+msgid "Inventory Code"
 msgstr "Numéro d'inventaire"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/reports/inventory.tmpl:3
@@ -5744,7 +5898,7 @@ msgid "Isbn"
 msgstr "Isbn"
 
 #. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:70
+#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:79
 msgid "Issue"
 msgstr "Prêter"
 
@@ -5752,22 +5906,30 @@ msgstr "Pr
 msgid "Issue / fine"
 msgstr "Prêt/amende"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:259
-msgid "Issue limit"
-msgstr "Prêts maximum"
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember-print.tmpl:12
+#
+msgid "Issue books"
+msgstr "Prêts"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/lateissues.tmpl:9
 msgid "Issue number"
 msgstr "Numéro d'exemplaire"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:141
+#. %1$s: TMPL_VAR name=cardnumber
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember-receipt.tmpl:7
+#, c-format
+msgid "Issued To <a1>%s</a>"
+msgstr "Prété à <a1>%s</a>"
+
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember-receipt.tmpl:10
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:144
 msgid "Issues"
 msgstr "N° parus"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/reports/issues_by_borrower_category.tmpl:40
 #: ../../koha-tmpl/intranet-tmpl/default/en/reports/reports-home.tmpl:11
 msgid "Issues by borrower category"
-msgstr "Prêts par catégories de lecteurs"
+msgstr "Prêts par catégorie de lecteur"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:4
 msgid "Issues for a subscription"
@@ -5777,7 +5939,7 @@ msgstr "N
 msgid "Issues summary"
 msgstr "Résumé des n° parus"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:151
+#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:160
 msgid "Issuing impossible"
 msgstr "Prêt impossible"
 
@@ -5798,12 +5960,13 @@ msgstr ""
 msgid "Issuing rules"
 msgstr "Règles de prêt"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/itemtypes.tmpl:16
-msgid "Issuing rules are set for item types (and for borrower types / branches)"
+msgid ""
+"Issuing rules are set for item types (and for borrower types / branches)"
 msgstr ""
-"Les règles dem prêt sont établies par type de documents (et par types de "
-"lecteurs / sites)"
+"Les règles de prêt sont établies par types de document (et par types de "
+"lecteur / sites)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/issuingrules.tmpl:3
 msgid "Issuing rules deals with 2 topics :"
@@ -5827,6 +5990,10 @@ msgstr ""
 "C'est utile d'importer un paquet de notices iso2709 qui pourront être "
 "utilisées plus tard pour un catalogage rapide"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:79
+msgid "Italian"
+msgstr "Italien"
+
 #. %1$s: TMPL_VAR name=itemtitle
 #. %2$s: TMPL_VAR name=itemauthor
 #. %3$s: TMPL_VAR name=branchname
@@ -5835,14 +6002,15 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl:15
 #, c-format
 msgid "Item %s (%s) is marked waiting at <b>%s</b> for %s (<a1>%s</a>)."
-msgstr "Le document %s (%s) est noté en attente à <b>%s</b> pour %s (<a1>%s</a>)."
+msgstr ""
+"Le document %s (%s) est noté en attente à <b>%s</b> pour %s (<a1>%s</a>)."
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl:43
 msgid "Item Barcode *"
 msgstr "Code à Barres de l'exemplaire *"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem-nomarc.tmpl:46
-#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:70
+#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:79
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl:98
 msgid "Item Barcode:"
 msgstr "Code à Barres de l'exemplaire :"
@@ -5864,7 +6032,7 @@ msgstr "Nombre d'exemplaires"
 msgid "Item Location (items.itemcallnumber) between %S and %S"
 msgstr "Cote de l'exemplaire ((items.itemcallnumber) entre %S et %S"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/searchresults.tmpl:64
 msgid "Item Lost"
 msgstr "Exemplaire perdu"
@@ -5889,7 +6057,7 @@ msgstr "Type de document"
 msgid "Item added with barcode %s"
 msgstr "Exemplaire ajouté avec code à barres %s"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl:69
 msgid "Item barcode"
 msgstr "Code à Barres de l'exemplaire"
@@ -5906,12 +6074,12 @@ msgstr "L'exemplaire est d
 msgid "Item is marked waiting at %s for %s (<a1>%s</a>)."
 msgstr "L'exemplaire est marqué en attente à %s pour %s (<a1>%s</a>)."
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:218
+#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:227
 msgid "Item issued"
 msgstr "Exemplaire en prêt"
 
 #. %1$s: TMPL_VAR name=ISSUED_TO_ANOTHER
-#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:193
+#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:202
 #, c-format
 msgid "Item issued to %s. Return &amp; issue?"
 msgstr "Exemplaire prêté à %s."
@@ -5922,7 +6090,7 @@ msgstr "Exemplaire pr
 msgid "Item marked Waiting:"
 msgstr "Exemplaire marqué 'En attente' :"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:159
+#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:168
 msgid "Item not for loan"
 msgstr "Exemplaire exclu du prêt"
 
@@ -5933,7 +6101,7 @@ msgid "Item should now be waiting at branch: %s"
 msgstr "L'exemplaire devrait être en attente au site : %s"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail-opac.tmpl:40
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:43
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:59
 #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl:27
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl:71
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl:73
@@ -5944,8 +6112,13 @@ msgstr "L'exemplaire devrait 
 msgid "Item type"
 msgstr "Type de document"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:42
 #
-#: ../../koha-tmpl/intranet-tmpl/default/en/help/search.marc/search.tmpl:13
+msgid "Item type :"
+msgstr "Type de document"
+
+# 
+#: ../../koha-tmpl/intranet-tmpl/default/en/help/search.marc/search.tmpl:14
 msgid ""
 "Item type : select here an item type. If none is selected, the search is "
 "done on every item type"
@@ -5955,7 +6128,7 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl:128
 msgid "Item type Admin"
-msgstr "Gestion des types de documents"
+msgstr "Gestion des types de document"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:24
 msgid "Item types"
@@ -5969,7 +6142,7 @@ msgstr ""
 "Les types de document sont utiles pour de nombreuses choses et <b>très</b> "
 "importants pour contrôler le fonctionnement de Koha :"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/itemtypes.tmpl:2
 msgid "Item types management"
 msgstr "Gestion des types de documents"
@@ -5991,11 +6164,11 @@ msgstr "L'exemplaire 
 msgid "Item was on loan to <a1>%s</a> %s and has been returned."
 msgstr "L'exemplaire était emprunté par <a1>%s</a> %s et a été retourné."
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:162
+#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:171
 msgid "Item withdrawn"
 msgstr "Exemplaire retiré"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem-nomarc.tmpl:34
 msgid "Item:"
 msgstr "Exemplaire(s)"
@@ -6008,7 +6181,8 @@ msgstr "Exemplaire(s)"
 #. %6$s: TMPL_VAR name=branchname
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl:52
 #, c-format
-msgid "Item: %s (%s) <a1> %s </a> for %s (<a2>%s</a>) to be collected at <b>%s</b>."
+msgid ""
+"Item: %s (%s) <a1> %s </a> for %s (<a2>%s</a>) to be collected at <b>%s</b>."
 msgstr ""
 "Exemplaire : %s (%s) <a1> %s </a> pour %s (<a2>%s</a>) peut être retiré à "
 "<b> %s</b>."
@@ -6023,7 +6197,9 @@ msgstr ""
 msgid ""
 "Item: %s (%s) needs to be transfered to <b>%s</b> to be picked up by %s (<a1>"
 "%s</a>)."
-msgstr "L'exemplaire: %s (%s) doit être transféré à <b>%s</b> pour être retiré par %s (<a1>%s</a>)."
+msgstr ""
+"L'exemplaire: %s (%s) doit être transféré à <b>%s</b> pour être retiré par %"
+"s (<a1>%s</a>)."
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/moditem.tmpl:14
 msgid "ItemNotes"
@@ -6035,26 +6211,35 @@ msgid "Itemnumber"
 msgstr "Numéro d'exemplaire"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl:30
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:377
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:40
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:374
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:56
 msgid "Items"
 msgstr "Exemplaires"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember-print.tmpl:14
+msgid "Items Checked Out"
+msgstr "Documents en prêt"
+
 #. %1$s: TMPL_VAR name=todaysdate
 #: ../../koha-tmpl/intranet-tmpl/default/en/overdue.tmpl:3
 #, c-format
 msgid "Items Overdue as of %s"
 msgstr "exemplaire en retard depuis le %s"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:162
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:155
 msgid "Items currently on issue"
 msgstr "exemplaire actuellement en prêt"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:114
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember-print.tmpl:39
+#
+msgid "Items on Reserve"
+msgstr "Réservation"
+
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:107
 msgid "Items requested"
-msgstr "exemplaires demandés"
+msgstr "Documents réservés"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:171
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:164
 msgid "Itemtype"
 msgstr "Type de document"
 
@@ -6083,11 +6268,11 @@ msgstr ""
 "avant de déterminer les règles de prêt. Vos types de document et de lecteur "
 "sont alors affichés dans une grille sur cet écran."
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:108
+#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:117
 msgid "Jan"
 msgstr "Janv"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:56
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:58
 msgid "Jo Ransom"
 msgstr "Jo Ransom"
 
@@ -6096,12 +6281,10 @@ msgstr "Jo Ransom"
 msgid "Join"
 msgstr "S'inscrire"
 
-#. %1$s: TMPL_VAR name=dateenrolled
-#. %2$s: TMPL_VAR name=expiry
-#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:19
-#, c-format
-msgid "Joined: %s, Expires: %s"
-msgstr "Inscription : %s, Se termine : %s"
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:18
+#
+msgid "Joined:"
+msgstr "Inscrit"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl:151
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/newimember.tmpl:47
@@ -6113,17 +6296,16 @@ msgstr "Site d'inscription"
 msgid "Joining Date"
 msgstr "Date d'inscription"
 
-#. %1$s: TMPL_VAR name=branchcode
-#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:20
-#, c-format
-msgid "Joining branch: %s"
-msgstr "Site d'inscription : %s"
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:19
+#
+msgid "Joining branch:"
+msgstr "Site d'inscription"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:114
+#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:123
 msgid "Jul"
 msgstr "Juil"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:113
+#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:122
 msgid "Jun"
 msgstr "Juin"
 
@@ -6196,10 +6378,6 @@ msgstr "KOHA: OPAC Recherche Catalogue"
 msgid "KOHA: online help"
 msgstr "KOHA: Aide en Ligne"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:29
-msgid "Katipo Communications"
-msgstr ""
-
 #: ../../koha-tmpl/intranet-tmpl/default/en/user/userpage.tmpl:57
 msgid "Keep a record of books I have read"
 msgstr "Garder un enregistrement des livres que j'ai lu"
@@ -6216,7 +6394,7 @@ msgstr "Tous les mots : recherche sur l'ensemble de la notice"
 msgid "Keywords:"
 msgstr "Mots clé"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:57
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:59
 msgid "Kip DeGraaf"
 msgstr "Kip DeGraaf"
 
@@ -6236,7 +6414,7 @@ msgstr "Kip DeGraaf"
 msgid "Koha"
 msgstr "Koha"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/koha2marclinks.tmpl:2
 msgid "Koha 2 MARC links"
 msgstr "Liens MARC %s"
@@ -6293,7 +6471,7 @@ msgstr ""
 "types de document et les code des sites, et vous pouvez lier ces valeurs "
 "autorisées à des sous-champs MARC quand vous établissez votre structure MARC"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/statecollection.tmpl:22
 msgid ""
 "Koha calculates automatically the end of the subscription (based on the "
@@ -6329,7 +6507,7 @@ msgstr "Champ Koha"
 msgid "Koha field : %s,"
 msgstr "Champ Koha : %s,"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl:99
 msgid ""
 "Koha internal (you should have no reasons to modify the following default "
@@ -6351,7 +6529,7 @@ msgid ""
 msgstr ""
 "Lien Koha : <b>très important</b>. Koha est compatible multi-MARC.Ainsi, il "
 "ne sait pas ce que 245$a signifie, pas plus que 200$f (ces 2 champs étantle "
-"titre en MARC21 et en UNIMARC !).Ainsi dans cette liste vous pouvez \"lier"
+"titre en MARC21 et en UNIMARC !).Ainsi dans cette liste vous pouvez \"lier "
 "\"un champ MARC à sa signification. Quand l'utilisateur veut chercher sur "
 "\"titre\", ce lien est utilisé pour savoir ce qui est cherché (245 si vous "
 "êtes en MARC21, 200 en UNIMARC)."
@@ -6390,7 +6568,7 @@ msgstr "EMPLACEMENT"
 msgid "Label heigth (Expressed in mm)"
 msgstr "Hauteur étiquette (en mm)"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:159
+#: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:156
 msgid "Label number to start printing"
 msgstr "Numéro d'étiquette ou commencer l'impression"
 
@@ -6403,7 +6581,7 @@ msgid "Language"
 msgstr "Langue"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail-opac.tmpl:44
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:46
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:62
 #: ../../koha-tmpl/intranet-tmpl/default/en/modbibitem.tmpl:79
 msgid "Last seen"
 msgstr "Vue pour la dernière fois"
@@ -6413,11 +6591,11 @@ msgid "Last seen at branch"
 msgstr "Vue pour la dernière fois au site"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:191
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:132
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:135
 msgid "Last value"
 msgstr "Dernière valeur"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-detail.tmpl:18
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:17
 msgid ""
@@ -6429,11 +6607,11 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl:47
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl:49
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:164
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:167
 msgid "Late"
 msgstr "En retard"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/statecollection.tmpl:8
 msgid ""
 "Late : means that the book is late and should be arrived. A books changed to "
@@ -6446,7 +6624,7 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/lateissues.tmpl:4
 msgid "Late issues"
-msgstr "Exemplaire en retard"
+msgstr "Numéros en retard"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/lateissues.tmpl:10
 msgid "Late since"
@@ -6457,13 +6635,13 @@ msgstr "Retard depuis"
 msgid "Legal"
 msgstr "Légal"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:68
 #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:70
 msgid "Letter"
 msgstr "Filtrer"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:140
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:141
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/koha2marclinks.tmpl:172
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:135
 msgid "Lib"
@@ -6482,7 +6660,7 @@ msgstr "Libell
 msgid "Librarian"
 msgstr "Bibliothécaire"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:11
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:14
 msgid "Librarian identity :"
 msgstr "Identité Bibliothécaire"
 
@@ -6490,7 +6668,7 @@ msgstr "Identit
 msgid "Librarian interface"
 msgstr "Interface bibliothécaire"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/branches.tmpl:3
 msgid "Library Branches"
 msgstr "Sites de la Bibliothèque"
@@ -6499,11 +6677,16 @@ msgstr "Sites de la Biblioth
 msgid "Library branches"
 msgstr "Sites de la Bibliothèque"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:45
 msgid "LibraryName --"
 msgstr "Bibliothèque"
 
+#. INPUT type=submit
+#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:54
+msgid "Lift Debarment"
+msgstr ""
+
 #. %1$s: TMPL_VAR name=link
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:139
 #, c-format
@@ -6523,7 +6706,7 @@ msgid "List Prices are"
 msgstr "La Liste des Prix est"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail-opac.tmpl:42
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:44
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:60
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/searchresults.tmpl:42
 #: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/result.tmpl:17
 #: ../../koha-tmpl/intranet-tmpl/default/en/modbibitem.tmpl:77
@@ -6598,7 +6781,7 @@ msgstr "Gestion des notices MARC"
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:19
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:21
 msgid "MARC constraints"
-msgstr "Occurences MARC"
+msgstr "Restrictions MARC"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/koha2marclinks.tmpl:11
 msgid ""
@@ -6634,7 +6817,7 @@ msgstr "Gestion de la structure des sous-champs MARC pour %s (Grille %s)"
 msgid "MARC tag structure admin for"
 msgstr "Gestion de la structure des champs MARC"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/marctagstructure.tmpl:2
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/marc_subfields_structure.tmpl:2
 msgid "MARC tag structure administration"
@@ -6667,14 +6850,14 @@ msgstr "DETAIL COORDONNEES LECTEUR"
 msgid "MEMBERSHIP DETAILS"
 msgstr "DETAILS DES INSCRITS"
 
-#
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:28
+# 
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:34
 msgid ""
 "MJ Ray and <b>Turo Technology LLP</b>, (quality control, installer &amp; "
 "updater, 2.0 release maintainer)"
 msgstr ""
-"MJ Ray et <b>Turo Technology LLP</b>, (contrôle qualité, "
-"installation et mise à jour, maintenance de la version 2.0)"
+"MJ Ray et <b>Turo Technology LLP</b>, (contrôle qualité, installation et "
+"mise à jour, maintenance de la version 2.0)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/request.tmpl:77
 msgid "MODIFY EXISTING REQUESTS"
@@ -6696,7 +6879,7 @@ msgstr "Menu G
 msgid "Male"
 msgstr "Homme"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl:80
 msgid "Manage serial subscriptions and issues"
 msgstr "Gestion des abonnements et des périodiques"
@@ -6736,7 +6919,7 @@ msgid "Manages thesaurus and authorities files."
 msgstr "Gère le thesaurus et les fichiers d'autorité"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:72
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:142
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:143
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:72
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:137
 msgid "Mandatory"
@@ -6764,11 +6947,11 @@ msgstr "Cr
 msgid "Manual Invoice"
 msgstr "Facture Manuelle"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:110
+#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:119
 msgid "Mar"
 msgstr "Mars"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:58
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:60
 msgid "Marco Gaiarin"
 msgstr "Marco Gaiarin"
 
@@ -6785,11 +6968,11 @@ msgstr "Marge gauche (en mm)"
 msgid "Mark seen"
 msgstr "Cocher vu"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:112
+#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:121
 msgid "May"
 msgstr "Mai"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:59
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:61
 msgid "Md. Aftabuddin"
 msgstr "Md. Aftabuddin"
 
@@ -6798,6 +6981,11 @@ msgstr "Md. Aftabuddin"
 msgid "Member"
 msgstr "Lecteur"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:82
+#
+msgid "Member Flags"
+msgstr "Habilitations"
+
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/members/moremember.tmpl:2
 msgid "Member Information Screen"
 msgstr "Information lecteur"
@@ -6812,14 +7000,30 @@ msgstr "Num
 msgid "Member Number: %s"
 msgstr "Numéro de Lecteur : %s"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/member-quicksearch.tmpl:3
+#
+msgid "Member Quick Search"
+msgstr "Recherche rapide lecteur"
+
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/member.tmpl:3
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:6
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/member-quicksearch-results.tmpl:4
 msgid "Member Search"
 msgstr "Recherche de lecteur"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl:106
 msgid "Member home"
-msgstr "Domicile lecteur"
+msgstr "Accueil lecteur"
+
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:84
+#
+msgid "Member is debarred."
+msgstr "Le lecteur est exclu"
+
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/member-quicksearch.tmpl:7
+#
+msgid "Member name:"
+msgstr "Nom du lecteur"
 
 #. %1$s: TMPL_VAR name=member
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/imemberentry.tmpl:23
@@ -6836,6 +7040,14 @@ msgstr "Lecteur# %s, Num
 msgid "Member# %s, Card number* %S"
 msgstr "Lecteur# %s, Numéro de carte* %S"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:85
+msgid "Member's address is in doubt."
+msgstr "L'adresse du lecteur est erronée"
+
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:86
+msgid "Member's card has been reported lost."
+msgstr "La carte a été déclarée perdue"
+
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-bottom.inc:7
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/about-bottom.inc:7
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/circulation-bottom.inc:7
@@ -6863,11 +7075,10 @@ msgstr "Aide lecteur"
 msgid "Membership Category"
 msgstr "Catégorie d'inscription"
 
-#. %1$s: TMPL_VAR name=categorycode
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:17
-#, c-format
-msgid "Membership Category: %s"
-msgstr "Catégorie d'inscription: %s"
+#
+msgid "Membership Category:"
+msgstr "Catégorie d'inscription"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/jmemberentry.tmpl:32
 msgid "Membership No."
@@ -6879,15 +7090,14 @@ msgstr "N
 msgid "Membership Number"
 msgstr "Numéro d'inscription"
 
-#. %1$s: TMPL_VAR name=borrowernumber
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:16
-#, c-format
-msgid "Membership Number: %s"
-msgstr "Numéro d'inscription: %s"
+#
+msgid "Membership Number:"
+msgstr "Numéro d'inscription"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:6
 msgid "Membership record"
-msgstr "Enregistrement de l'inscription"
+msgstr "Description de l'inscription"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/newbasket2.tmpl:57
 msgid "Mending"
@@ -6899,19 +7109,19 @@ msgstr "Mending"
 msgid "Messages"
 msgstr "Messages"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:60
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:62
 msgid "Michaes Herman"
 msgstr "Michaes Herman"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:27
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:36
 msgid "Mike Hansen"
 msgstr "Mike Hansen"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:61
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:63
 msgid "Mike Johnson"
 msgstr "Mike Johnson"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:62
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:64
 msgid "Mike Mylonas"
 msgstr "Mike Mylonas"
 
@@ -6921,11 +7131,11 @@ msgstr "Melle"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl:52
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl:54
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:167
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:170
 msgid "Missing"
 msgstr "Manquant"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/statecollection.tmpl:9
 msgid ""
 "Missing : means the book will never arrive. The issue disappear from the "
@@ -6940,7 +7150,7 @@ msgstr ""
 msgid "Missing issues"
 msgstr "Bulletins manquants"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/statecollection.tmpl:17
 msgid ""
 "Missing numbers : the list of issues you don't have in your library, and "
@@ -6953,8 +7163,8 @@ msgstr ""
 "bibliothèque, et qui n'arriveront jamais (ou qui ont été perdus)."
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:114
-#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:75
-#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:80
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:63
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:65
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl:37
 msgid "Modify"
 msgstr "Modifier"
@@ -6969,11 +7179,6 @@ msgstr "Modifier le Groupe - %s"
 msgid "Modify Item"
 msgstr "Modifier l'exemplaire"
 
-#. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:93
-msgid "Modify User Flags"
-msgstr "Modifier les autorisations d'utilisation"
-
 #: ../../koha-tmpl/intranet-tmpl/default/en/modbib.tmpl:3
 msgid "Modify Website Links"
 msgstr "Modifier les liens du site Web"
@@ -7050,6 +7255,11 @@ msgid ""
 "of the database. Right now, one can either have permission to access "
 "everything on the Intranet side, or just have access to the OPAC."
 msgstr ""
+"La modification des autorisations d'utilisation permet à un administrateur "
+"de fixer quels secrétaires, bibliothécaires, lecteurs, personnel technique "
+"de maintenance ou membre de l'administration ont accès à certaines parties "
+"de la base de données.Sans délai, quelqu'un peut soit avoir la permission "
+"d'accéder à tout par l'Intranet, ou seulement avoir accès à l'OPAC."
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/stopwords.tmpl:57
 msgid "Modify word"
@@ -7058,11 +7268,11 @@ msgstr "Modifier le mot"
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:48
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:94
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:96
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:58
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:61
 msgid "Monday"
 msgstr "Lundi"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:107
+#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:116
 msgid "Month"
 msgstr "Mois"
 
@@ -7106,7 +7316,7 @@ msgstr "NOUVEAU LECTEUR"
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:159
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl:166
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:76
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:93
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:94
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:40
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:106
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:83
@@ -7126,7 +7336,7 @@ msgstr "NOUVEAU LECTEUR"
 msgid "NO"
 msgstr "NON"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/stopwords.tmpl:110
 msgid ""
 "NOTE : if you change something in this table, ask your administrator to run "
@@ -7135,7 +7345,7 @@ msgstr ""
 "REMARQUE : Si vous changez quelque chose dans cette table, demander à votre "
 "administrateur de lancer le script misc/rebuildnonmarc.pl"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:129
 msgid ""
 "NOTE : if you change the link between a MARC subfield and a non-MARC field, "
@@ -7263,20 +7473,20 @@ msgstr "Enregistrements Suivants"
 msgid "Next&gt;&gt;"
 msgstr "Suivant &gt;&gt;"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:26
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:35
 msgid "Nicholas Rosasco, (Documentation Compiler)"
 msgstr "Nicholas Rosasco,(rédacteur de la documentation)"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:63
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:65
 msgid "Nicolas Morin (French Translation in 2.0)"
 msgstr "Nicolas Morin, (traduction française 2.0)"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:135
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:151
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:128
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:152
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:153
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:126
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:192
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:276
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:273
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl:145
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:146
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:147
@@ -7302,11 +7512,11 @@ msgstr "Pas de Titre"
 msgid "No borrower matched %s"
 msgstr "Pas de lecteurs correspondant %s"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:102
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:95
 msgid "No debts"
 msgstr "Pas de dettes"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:53
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:52
 msgid "No guarantor"
 msgstr "Pas de Garant"
 
@@ -7314,7 +7524,7 @@ msgstr "Pas de Garant"
 msgid "No items found"
 msgstr "Pas d'exemplaire(s) trouvé(s)"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:174
+#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:183
 msgid "No more renewals possible"
 msgstr "Pas de renouvellements supplémentaires possibles"
 
@@ -7340,11 +7550,11 @@ msgstr "Nombre de pr
 msgid "Non-Fiction"
 msgstr "Non-Fiction"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:153
-#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:202
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:146
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:195
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:92
 msgid "None"
-msgstr "Sans"
+msgstr "Aucun"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/stopwords.tmpl:5
 msgid ""
@@ -7361,7 +7571,7 @@ msgstr ""
 "\"encombré\"de mots qui ne sont pas vraiment utiles. La liste des \"mots "
 "vides\" détermine la liste de ces mots inutiles à votre installation."
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/searchresults.tmpl:63
 msgid "Not Available"
 msgstr "Indisponible"
@@ -7379,7 +7589,7 @@ msgstr "Non R
 msgid "Not allowed"
 msgstr "Non autorisé"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:184
+#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:193
 msgid "Not an issue but a renewal"
 msgstr "Pas un prêt, mais un renouvellement"
 
@@ -7401,7 +7611,7 @@ msgstr "Pas en pr
 msgid "Not repeatable,"
 msgstr "Non répétable"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/issuingrules.tmpl:11
 msgid ""
 "Note : fines are calculated by the fines2.pl script, located in misc "
@@ -7410,15 +7620,16 @@ msgstr ""
 "Remarque : les amendes sont calculées par le script fines2.pl, situé dans le "
 "répertoire misc"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/export/marc.tmpl:14
+#: ../../koha-tmpl/intranet-tmpl/default/en/export/marc.tmpl:12
 msgid "Note : the items are NOT exported by this tool"
 msgstr "Remarque : les exemplaires NE SONT PAS exportés par cet outil"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-renew.tmpl:15
 msgid "Note for the librarian that will manage your renewal request"
-msgstr "Remarque pour le bibliothécaire qui va gérer votre demande de renouvellement"
+msgstr ""
+"Remarque pour le bibliothécaire qui va gérer votre demande de renouvellement"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/statecollection.tmpl:24
 msgid ""
 "Note that the subscription renewal done by the \"serials librarian\" is "
@@ -7472,16 +7683,12 @@ msgstr "Notes"
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem-nomarc.tmpl:36
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem-nomarc.tmpl:56
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem-nomarc.tmpl:97
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:16
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:38
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:35
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:19
 msgid "Notes:"
 msgstr "Notes :"
 
-#. %1$s: TMPL_VAR name=altnotes
-#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:36
-#, c-format
-msgid "Notes: %s"
-msgstr "Notes : %s"
-
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/isbnsearch.tmpl:34
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/isbnsearch.tmpl:89
 #: ../../koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl:33
@@ -7496,7 +7703,7 @@ msgstr "Pr
 msgid "Notify me about overdues by email"
 msgstr "Prévenez moi de retards par messagerie (e-mail)"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:118
+#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:127
 msgid "Nov"
 msgstr "Nov"
 
@@ -7525,7 +7732,7 @@ msgstr ""
 "alphabétique des codes --Veillez à sélectionner le site la première fois que "
 "vous utilisez Koha ou lorsque vous ajoutez un nouvel ordinateur!)"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/help/circ/returns.tmpl:4
+#: ../../koha-tmpl/intranet-tmpl/default/en/help/circ/returns.tmpl:5
 msgid ""
 "Now simply scan or type the returned item's identifying number (usually a "
 "barcode) in the box provided."
@@ -7540,22 +7747,22 @@ msgid ""
 "scanning or typing the item's identifying number (usually a barcode)."
 msgstr ""
 "Maintenant commencez par scanner le code à barres du lecteur ou tapez son "
-"nom pour trouver leur compte.Lorsque Koha a trouvé un lecteur, vous verrez "
-"un nouveau pavé pour scanner ou taper le numéro identifiant le document (en "
+"nom pour trouver son compte.Lorsque Koha a trouvé le lecteur, vous verrez un "
+"nouveau pavé pour scanner ou taper le numéro identifiant le document (en "
 "général un code à barres)."
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl:22
 msgid "Number"
 msgstr "Nombre"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:134
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:81
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:84
 msgid "Number of issues"
 msgstr "Nombre de bulletins"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:136
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:83
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:86
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-renew.tmpl:14
 msgid "Number of months"
 msgstr "Nombre de mois"
@@ -7569,7 +7776,7 @@ msgid "Number of renewals allowed"
 msgstr "Nombre de renouvellement autorisé"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:135
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:82
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:85
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-renew.tmpl:13
 msgid "Number of weeks"
 msgstr "Nombre de semaines"
@@ -7585,7 +7792,7 @@ msgstr "Num
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-detail.tmpl:11
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:10
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:140
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:87
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:90
 msgid "Numbering calculation"
 msgstr "Calcul de la numérotation"
 
@@ -7596,13 +7803,14 @@ msgid "Numbering formula: %S"
 msgstr "Formule de numérotation : %S"
 
 #. %1$s: TMPL_VAR name=numberingmethod
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:89
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:92
 #, c-format
 msgid "Numbering formula: %s"
 msgstr "Formule de numérotation : %s"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:26
+#
 msgid ""
 "N°2004/1, N°2004/2, N°2004/3, N°2004/4, N°2005/1, N°2005/2, N°2005/3, N°"
 "2005/4, N°2006/1"
@@ -7610,8 +7818,9 @@ msgstr ""
 "N°2004/1, N°2004/2, N°2004/3, N°2004/4, N°2005/1, N°2005/2, N°2005/3, N° "
 "2005/4, N°2006/1"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-detail.tmpl:25
+#
 msgid ""
 "N°2004/1,N°2004/2,N°2004/3,N°2004/4,N°2005/1,N°2005/2,N°2005/3,N°2005/4,N°"
 "2006/1"
@@ -7627,13 +7836,14 @@ msgstr "Retards/Pr
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl:9
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl:190
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:29
-#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:56
+#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:65
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl:24
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl:46
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/jmemberentry.tmpl:100
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/member.tmpl:9
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:9
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/newimember.tmpl:175
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/member-quicksearch.tmpl:7
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:19
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:33
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:45
@@ -7651,9 +7861,9 @@ msgstr "Retards/Pr
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl:174
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:49
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:74
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:100
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:115
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:133
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:101
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:116
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:134
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:19
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:49
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:85
@@ -7729,11 +7939,11 @@ msgstr "INFORMATION DE COMMANDE"
 msgid "OS version ('uname -a')"
 msgstr "Version de l'OS ('uname -a) :"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:117
+#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:126
 msgid "Oct"
 msgstr "Oct"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/marcimport.tmpl:25
 #: ../../koha-tmpl/intranet-tmpl/default/en/import/breeding.tmpl:19
 msgid ""
@@ -7754,7 +7964,7 @@ msgstr "En Pr
 msgid "On Loan until %s"
 msgstr "En Prêt jusqu'à %s"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:189
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:182
 msgid "On Request - no renewals"
 msgstr "Réservé-pas de renouvellement"
 
@@ -7766,9 +7976,9 @@ msgstr "Pr
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/members/moremember.tmpl:4
 msgid "On the top left is their address and card number."
-msgstr ""
+msgstr "En haut à gauche il y a leur adresse et leur numéro de carte."
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/biblio_framework.tmpl:5
 msgid ""
 "Once a framework type is created, you can clic on \"MARC structure\" to "
@@ -7816,7 +8026,7 @@ msgstr ""
 "(Les virgules seront converties en chiffres décimaux).REMARQUE Vos dates ne "
 "seront pas sauvegardées correctement si vous n'avez pas choisi la forme des "
 "dates dans la section Préférences Système du module Paramètres--FAITES-LE "
-"AVANT de créer les budgets). "
+"AVANT de créer les budgets)."
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio-nomarc.tmpl:17
 msgid "One Author per line"
@@ -7826,18 +8036,8 @@ msgstr "Un Auteur par ligne"
 msgid "One Subject per line"
 msgstr "Un sujet par ligne"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/errors/400.tmpl:4
-#: ../../koha-tmpl/intranet-tmpl/default/en/errors/401.tmpl:4
-#: ../../koha-tmpl/intranet-tmpl/default/en/errors/402.tmpl:4
-#: ../../koha-tmpl/intranet-tmpl/default/en/errors/403.tmpl:4
-#: ../../koha-tmpl/intranet-tmpl/default/en/errors/404.tmpl:4
-#: ../../koha-tmpl/intranet-tmpl/default/en/errors/405.tmpl:4
-#: ../../koha-tmpl/intranet-tmpl/default/en/errors/500.tmpl:4
-msgid "One error happens !!"
-msgstr "Erreur !!"
-
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail-opac.tmpl:59
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:69
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:85
 msgid "Online"
 msgstr "En ligne"
 
@@ -7863,7 +8063,8 @@ msgstr "Commande"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl:116
 msgid "Order items, receive orders, set budgets..."
-msgstr "Commander des documents, recevoir des commandes, établir des budgets..."
+msgstr ""
+"Commander des documents, receptionner des commandes, gérer des budgets..."
 
 #. %1$s: TMPL_VAR name=date
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl:10
@@ -7871,7 +8072,7 @@ msgstr "Commander des documents, recevoir des commandes, 
 msgid "Order placed: %s"
 msgstr "Commande faite : %s"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/histsearch.tmpl:3
 msgid "Order search"
 msgstr "Recherche sur les commandes"
@@ -7879,7 +8080,7 @@ msgstr "Recherche sur les commandes"
 #: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl:138
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/search.tmpl:28
 msgid "Ordered by"
-msgstr "Commandé par"
+msgstr "Trié par"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl:14
 msgid "Other forms"
@@ -7889,7 +8090,7 @@ msgstr "Autres formes"
 msgid "Other lib"
 msgstr "Autres libellés"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl:67
 msgid "Other options"
 msgstr "Autres options"
@@ -7898,22 +8099,24 @@ msgstr "Autres options"
 msgid "Otherwise, a biblio can be added from scratch."
 msgstr "Sinon, une notice peut-être ajoutée en partant de zéro."
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:258
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:257
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:261
 msgid "Overdue"
 msgstr "Retard"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/categorie.tmpl:23
 msgid "Overdue Notice Required"
-msgstr "Avis de retard demandé"
+msgstr "Note de retard demandée"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/categorie.tmpl:24
 msgid ""
 "Overdue Notice Required lets you bypass generating overdue notices for this "
 "user type."
 msgstr ""
+"Note de retard demandée vous permet de forcer les notes de retard affichées "
+"pour ce type d'usager."
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/issuingrules.tmpl:14
 msgid "Overdue charges"
 msgstr "Amendes pour retard"
@@ -7935,7 +8138,17 @@ msgstr "Documents en retard"
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:132
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:202
 msgid "Overdue notice required"
-msgstr "Avis de retard demandé"
+msgstr "Note de retard demandée"
+
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember-print.tmpl:33
+#
+msgid "Overdue!"
+msgstr "Retard!"
+
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember-receipt.tmpl:26
+#
+msgid "Overdues"
+msgstr "Retards"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:87
 #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:160
@@ -7958,12 +8171,12 @@ msgstr "DETAILS PERSONNELS"
 msgid "PERSONAL DETAILS"
 msgstr "DETAILS PERSONNELS"
 
-#
-#: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:137
+# 
+#: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:134
 msgid "Page Size"
 msgstr "Taille"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:32
 msgid "Page Type"
 msgstr "Format de page"
@@ -7997,6 +8210,10 @@ msgstr "Pages :"
 msgid "Parameters"
 msgstr "Paramètres"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:76
+msgid "Pascale Nalon (ENSMP) and Jean Yves Lemaire (Saint Germain sur Morin)"
+msgstr "Pascale Nalon (ENSMP) et Jean Yves Lemaire (Saint Germain sur Morin)"
+
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl:108
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl:164
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl:208
@@ -8012,7 +8229,12 @@ msgstr "Mot de passe :"
 msgid "Patron"
 msgstr "Emprunteur"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:64
+#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:48
+#
+msgid "Patron is debarred"
+msgstr "Le lecteur est exclu"
+
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:66
 msgid "Pawel Skuza (Polish for 1.2)"
 msgstr "Pawel Skuza (Polonais pour la version 1.2)"
 
@@ -8063,26 +8285,27 @@ msgstr "T
 msgid "Phone daytime"
 msgstr "Téléphone en journée"
 
-#. %1$s: TMPL_VAR name=phoneday
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:12
-#, c-format
-msgid "Phone daytime: %s"
-msgstr "Téléphone travail : %s"
+#
+msgid "Phone daytime:"
+msgstr "Téléphone bureau"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl:182
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/newmember.tmpl:133
 msgid "Phone home"
 msgstr "Téléphone Domicile"
 
-#. %1$s: TMPL_VAR name=phone
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:11
-#, c-format
-msgid "Phone home: %s"
-msgstr "Téléphone Domicile : %s"
+#
+msgid "Phone home:"
+msgstr "Téléphone Domicile"
 
-#. For the first occurrence,
-#. %1$s: TMPL_VAR name=altphone
-#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:32
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:31
+#
+msgid "Phone:"
+msgstr "Téléphone"
+
+#. %1$s: TMPL_VAR name=branchphone
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:127
 #, c-format
 msgid "Phone: %s"
@@ -8106,18 +8329,18 @@ msgstr "Emplacement"
 msgid "Place of Publication:"
 msgstr "Lieu d'édition"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem-nomarc.tmpl:31
 msgid "Place:"
 msgstr "Emplacement"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/histsearch.tmpl:10
 msgid "Placed on"
 msgstr "Prévu pour"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:28
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:19
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:22
 msgid "Planning"
 msgstr "Calendrier"
 
@@ -8203,13 +8426,10 @@ msgstr "Adresse Postale"
 msgid "Postal Address*"
 msgstr "Adresse Postale*"
 
-#. %1$s: TMPL_VAR name=streetaddress
-#. %2$s: TMPL_VAR name=zipcode
-#. %3$s: TMPL_VAR name=city
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:9
-#, c-format
-msgid "Postal Address: %s, %s %s"
-msgstr "Adresse Postale: %s, %s %s"
+#
+msgid "Postal Address:"
+msgstr "Adresse Postale"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl:34
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/newmember.tmpl:247
@@ -8229,7 +8449,7 @@ msgstr "Nom usuel"
 msgid "Preferred Branch"
 msgstr "Site préférentiel"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:260
+#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:269
 msgid "Previous Issues"
 msgstr "Prêts précédents"
 
@@ -8249,7 +8469,7 @@ msgstr "Imprimer"
 msgid "Printer"
 msgstr "Imprimante"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:3
 msgid "Printer Configuration"
 msgstr "Configuration imprimante"
@@ -8302,6 +8522,11 @@ msgstr "Ann
 msgid "Publication Year:"
 msgstr "Année de Publication :"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:27
+#
+msgid "Published by :"
+msgstr "édité par :"
+
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl:99
 #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl:34
 #: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl:93
@@ -8346,7 +8571,7 @@ msgstr "Quantit
 msgid "Quantity Received *"
 msgstr "Quantité Reçue *"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/histsearch.tmpl:12
 msgid "Quantity ordered"
 msgstr "Quantité Commandée"
@@ -8355,14 +8580,14 @@ msgstr "Quantit
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/printers.tmpl:123
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/printers.tmpl:168
 msgid "Queue"
-msgstr "En attente"
+msgstr "File d'attente"
 
 #. SCRIPT
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/printers.tmpl:57
 msgid "Queue missing"
 msgstr "File d'attente absente"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:31
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:28
 msgid "Rachel Hamilton-Williams, General Manager (Webmistress)"
 msgstr "Rachel Hamilton-Williams, General Manager (Webmistress)"
 
@@ -8388,7 +8613,7 @@ msgstr "Taux"
 msgid "Rate missing"
 msgstr "Taux manquant"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:158
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:151
 msgid "Reading Record"
 msgstr "Liste des lectures"
 
@@ -8426,7 +8651,7 @@ msgstr "Re
 msgid "Received By: %s"
 msgstr "Reçu Par : %s"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull-home.tmpl:9
 msgid ""
 "Recieve any item and/or manage what appears in subscription summary (in OPAC "
@@ -8435,12 +8660,12 @@ msgstr ""
 "Recevoir chaque numéro et/ou géré ce qui s'affiche dans le résumé de "
 "l'abonnement (à l'OPAC et dans l'interface bibliothècaire)"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl:78
 msgid "Recieved issues"
 msgstr "Bulletins reçus"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/histsearch.tmpl:11
 msgid "Recieved on"
 msgstr "Livré le"
@@ -8465,7 +8690,7 @@ msgstr ""
 msgid "Reference Books"
 msgstr "Ouvrages de référence"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:65
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:67
 msgid "Regula Sebastiao"
 msgstr "Regula Sebastiao"
 
@@ -8483,13 +8708,12 @@ msgstr "Li
 msgid "Relationship"
 msgstr "Relation"
 
-#. %1$s: TMPL_VAR name=altrelationship
-#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:34
-#, c-format
-msgid "Relationship: %s"
-msgstr "Relation: %s"
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:33
+#
+msgid "Relationship:"
+msgstr "Relation"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:121
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:114
 msgid "Remove"
 msgstr "Retirer"
 
@@ -8499,16 +8723,16 @@ msgstr "Retirer"
 msgid "Remove Selected Items"
 msgstr "Retirer les Exemplaires Sélectionnés"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:173
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:166
 msgid "Renew"
 msgstr "Renouvellement"
 
 #. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:199
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:192
 msgid "Renew Items"
 msgstr "Exemplaires Renouvellés"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:10
 msgid ""
 "Renew Items, view add, modify and delete records, all by starting with this "
@@ -8525,7 +8749,7 @@ msgstr "Renouvelable"
 msgid "Renewals"
 msgstr "Renouvellements"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/statecollection.tmpl:23
 msgid ""
 "Renewing a subscription means that you define some informations for the "
@@ -8551,7 +8775,7 @@ msgid "Rental charge is not a number"
 msgstr "Le prix de location n'est pas un nombre"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:71
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:141
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:142
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:71
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:136
 msgid "Repeatable"
@@ -8595,7 +8819,7 @@ msgstr "Champ de report"
 msgid "Reports"
 msgstr "Bilans"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:38
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:35
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/searchresults.tmpl:74
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/ISBDdetail.tmpl:19
 #: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/result.tmpl:54
@@ -8611,7 +8835,8 @@ msgstr "R
 msgid "Request a renewal"
 msgstr "Demander un renouvellement"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:120
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:113
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember-print.tmpl:44
 msgid "Requested"
 msgstr "Réservés"
 
@@ -8627,7 +8852,7 @@ msgstr "Demand
 msgid "Requests"
 msgstr "Demandes"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:260
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:258
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:262
 msgid "Reserve"
 msgstr "Réservation"
@@ -8647,19 +8872,19 @@ msgstr "R
 msgid "Reserve fee"
 msgstr "Droits de réservation"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl:51
 msgid "Reserve found"
 msgstr "Réservation trouvée"
 
 #. %1$s: TMPL_VAR name=RESERVE_WAITING
-#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:187
+#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:196
 #, c-format
 msgid "Reserve waiting for %s"
 msgstr "Réservation en attente pour %s"
 
 #. %1$s: TMPL_VAR name=RESERVED
-#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:190
+#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:199
 #, c-format
 msgid "Reserved by %s"
 msgstr "Réservé Par : %s"
@@ -8749,7 +8974,7 @@ msgstr "R
 msgid "Return to Details Page"
 msgstr "Retour à la page Détails"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/readingrec.tmpl:24
 msgid "Returned"
 msgstr "Rendu"
@@ -8766,11 +8991,11 @@ msgstr "Documents rendus"
 msgid "Rick Hansen Library"
 msgstr "Rick Hansen Library"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:66
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:68
 msgid "Roger Buck"
 msgstr "Roger Buck"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:67
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:69
 msgid "Ron Wickersham"
 msgstr "Ron Wickersham"
 
@@ -8799,7 +9024,7 @@ msgstr "Echantillon"
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:63
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:119
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:121
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:73
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:76
 msgid "Saturday"
 msgstr "Samedi"
 
@@ -8822,13 +9047,13 @@ msgstr "Enregistrer"
 msgid "Save Changes"
 msgstr "Enregistrer les Changements"
 
-#
+# 
 #. INPUT type=submit name=submit
 #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:28
 msgid "Save Code"
 msgstr "Enregistrer code"
 
-#
+# 
 #. INPUT type=submit
 #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:98
 msgid "Save Settings"
@@ -8868,7 +9093,7 @@ msgstr "R
 msgid "Search Style:"
 msgstr "Type de recherche"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl:76
 msgid ""
 "Search a biblio. When this biblio is found, you can check its status, "
@@ -8895,9 +9120,10 @@ msgstr ""
 msgid "Search catalogue"
 msgstr "Recherche catalogue"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/bull-home.tmpl:3
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull-home.tmpl:4
+#
 msgid ""
 "Search for a subscription by using the filter button (with a ISSN or a "
 "title). If you enter a title, you can use the wildcard % : entering <b>%Times"
@@ -8908,7 +9134,7 @@ msgstr ""
 "vous saisissez un titre, vous pouvez utiliser le joker % : <b>%Monde%</b> "
 "renverra tous les abonnement contenant Monde dans le titre"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/help/search.marc/search.tmpl:16
+#: ../../koha-tmpl/intranet-tmpl/default/en/help/search.marc/search.tmpl:17
 msgid "Search method"
 msgstr "Méthode de Recherche"
 
@@ -8924,11 +9150,16 @@ msgid "Search on"
 msgstr "Rechercher sur"
 
 #. IMG
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:123
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:183
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:243
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:303
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:363
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:90
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:120
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:150
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:180
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:210
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:240
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:270
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:300
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:330
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:360
 msgid "Search on this Field's Value"
 msgstr "Rechercher à partir des valeurs de ces champs"
 
@@ -8958,7 +9189,7 @@ msgstr "Rechercher dans le Catalogue"
 msgid "Search value"
 msgstr "Valeur de Recherche"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:68
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:70
 msgid "Sebastiaan Durand"
 msgstr "Sebastiaan Durand"
 
@@ -9006,7 +9237,8 @@ msgstr "S
 #. %1$S: type=text name=value
 #: ../../koha-tmpl/intranet-tmpl/default/en/reports/issues_by_borrower_category.tmpl:42
 #, c-format
-msgid "Select a borrower category (or don't if you want to see global status) %S"
+msgid ""
+"Select a borrower category (or don't if you want to see global status) %S"
 msgstr ""
 "Sélectionner une catégorie de lecteur (ou rien si vous souhaitez visualiser "
 "l'état global) %S"
@@ -9029,12 +9261,13 @@ msgstr "Selectionnez une annexe :"
 msgid "Select a branch : %s"
 msgstr "Sélectionnez une annexe : %s"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/marcimport.tmpl:22
 #: ../../koha-tmpl/intranet-tmpl/default/en/import/breeding.tmpl:16
+#
 msgid ""
-"Select a file to import into the breeding farm. It will be parsed, and for "
-"each ISBN found, a new baby will be created in the breeding farm."
+"Select a file to import into the reservoir. It will be parsed, and for each "
+"ISBN found, a new baby will be created in the reservoir."
 msgstr ""
 "Sélectionner un fichier à importer dans le réservoir.Il sera analysé, et "
 "pour chaque ISBN trouvé, une nouvelle copie sera créé dans le réservoir."
@@ -9043,11 +9276,12 @@ msgstr ""
 msgid "Select a framework"
 msgstr "Sélectionner une grille"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:51
+#
 msgid ""
-"Select a range of inventary codes. You can select wether a continuous range "
-"or individual inventary codes"
+"Select a range of inventary codes. You can choose a continuous range or "
+"individual inventory codes"
 msgstr ""
 "Sélectionnez une plage pour les numéros d'inventaire. Vous pouvez "
 "sélectionner une série continue ou une liste de codes disjoints"
@@ -9057,10 +9291,15 @@ msgstr ""
 msgid "Select a set of MARC records"
 msgstr "Sélectionnez un ensemble d'enregistrements MARC"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:122
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:123
 msgid "Select an authority framework"
 msgstr "Sélectionner une grille d'autorité"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/export/marc.tmpl:6
+#
+msgid "Select biblios to export"
+msgstr "Sélectionnez les notices à exporter :"
+
 #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/addbookbybiblionumber.tmpl:3
 msgid "Select bookshelf"
 msgstr "Sélectionner une étagère"
@@ -9082,7 +9321,7 @@ msgstr "S
 msgid "Select the standard type to generate barcodes."
 msgstr "Sélectionner le style de modèle pour générer des codes à barres"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:116
+#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:125
 msgid "Sep"
 msgstr "Sept"
 
@@ -9101,7 +9340,7 @@ msgstr "Num
 msgid "Serial search results"
 msgstr "Résultats de recherche de Périodiques"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl:79
 msgid "Serials"
 msgstr "Périodiques"
@@ -9130,7 +9369,7 @@ msgstr "Abonnements P
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl:34
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl:127
 msgid "Series"
-msgstr "Périodique"
+msgstr "Collections"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl:20
 #: ../../koha-tmpl/intranet-tmpl/default/en/modbib.tmpl:30
@@ -9159,7 +9398,7 @@ msgstr "Filtrer"
 #. INPUT type=submit
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/member-flags.tmpl:15
 msgid "Set Flags"
-msgstr "Définir les autorisations"
+msgstr "Confirmer les autorisations"
 
 #. INPUT type=submit
 #: ../../koha-tmpl/intranet-tmpl/default/en/user/userpage.tmpl:61
@@ -9167,11 +9406,11 @@ msgid "Set Preferences"
 msgstr "Options Préférences"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:183
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:125
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:128
 msgid "Set back to"
 msgstr "Retourner à"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-detail.tmpl:17
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:16
 msgid ""
@@ -9187,7 +9426,7 @@ msgstr ""
 "Sélectionner la configuration d'imprimante correspondant à votre "
 "environnement"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:14
 msgid ""
 "Set margin left and margin bottom of the page that you are going to use. "
@@ -9228,11 +9467,10 @@ msgstr ""
 msgid "Sex"
 msgstr "Sexe"
 
-#. %1$s: TMPL_VAR name=sex
-#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:28
-#, c-format
-msgid "Sex: %s"
-msgstr "Sexe %s"
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:27
+#
+msgid "Sex:"
+msgstr "Sexe"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/shelves.tmpl:116
 msgid "Shelf List"
@@ -9335,21 +9573,19 @@ msgstr "D
 msgid "Sort field 1"
 msgstr "Champ de tri 1"
 
-#. %1$s: TMPL_VAR name=sort1
-#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:38
-#, c-format
-msgid "Sort field 1 : %s"
-msgstr "Champ de tri 1 : %s"
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:37
+#
+msgid "Sort field 1 :"
+msgstr "Champ de tri 1"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl:186
 msgid "Sort field 2"
 msgstr "Champ de tri 2"
 
-#. %1$s: TMPL_VAR name=sort2
-#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:41
-#, c-format
-msgid "Sort field 2 : %s"
-msgstr "Champ de tri 2 : %s"
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:40
+#
+msgid "Sort field 2 :"
+msgstr "Champ de tri 2"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/jmemberentry.tmpl:80
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl:261
@@ -9361,8 +9597,13 @@ msgstr "Champ de tri 1"
 msgid "Sorting field 2"
 msgstr "Champ de tri 2"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:78
+msgid "Spanish"
+msgstr "Espagnol"
+
 #: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:15
-msgid "Special thanks to the following funders"
+#
+msgid "Special thanks to the following libraries"
 msgstr "Un merci particulier aux financeurs suivants"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl:46
@@ -9413,21 +9654,29 @@ msgstr "Commence par"
 msgid "State of collection"
 msgstr "Etat de collection"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember-print.tmpl:20
 #: ../../koha-tmpl/intranet-tmpl/default/en/suggestion/acceptorreject.tmpl:8
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl:24
 msgid "Status"
 msgstr "Etat"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:25
+#
 msgid ""
-"Stephen Hedges &amp; the <b>Nelsonville Public Library</b> (MARC features "
-"funders)"
+"Stephen Hedges, Owen Leonard, Joshua Ferraro (<b>Nelsonville Public Library</"
+"b>)"
 msgstr ""
-"Stephen Hedges et La <b>Bibliothèque Publique de Nelsonville</b> "
-"(Financement du codage MARC)"
+"Stephen Hedges, Owen Leonard, Joshua Ferraro (<b>Nelsonville Public Library</"
+"b>)"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:131
+# 
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:71
+#
+msgid "Steve Tonnesen (early MARC work, Virtual Bookshelves concept, KohaCD)"
+msgstr "Steve Tonnesen (début MARC, concept d'étagères virtuelles, KohaCD)"
+
+#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:140
 msgid "Sticky Due Date"
 msgstr "Date de retour manuelle"
 
@@ -9437,7 +9686,7 @@ msgstr "Date de retour manuelle"
 msgid "Still %s requests to go"
 msgstr "Encore %s demandes en cours"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/stopwords.tmpl:2
 msgid "Stop word administration page"
 msgstr "Gestion des mots vides"
@@ -9476,7 +9725,7 @@ msgstr "Sous-champ"
 msgid "Subfield %s %s"
 msgstr "Sous-champ %s %s"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:144
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:145
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:139
 msgid "Subfields"
 msgstr "Sous-champs"
@@ -9507,6 +9756,11 @@ msgstr "Vedette sujet"
 msgid "Subject search results"
 msgstr "Résultats de recherche"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:33
+#
+msgid "Subject(s):"
+msgstr "Sujet(s)"
+
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/catalogue-home.tmpl:42
 msgid "Subject:"
 msgstr "Sujet"
@@ -9522,7 +9776,7 @@ msgstr "Sujet:%S"
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/selectbranchprinter.tmpl:32
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/newmember.tmpl:226
 msgid "Submit"
-msgstr "Soumettre"
+msgstr "Valider"
 
 #. IMG
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/receipt-search-result.tmpl:43
@@ -9534,7 +9788,7 @@ msgstr "Abonnement p
 msgid "Subscription"
 msgstr "Abonnement"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/statecollection.tmpl:14
 msgid ""
 "Subscription beginning date : the date of the beginning of the 1st "
@@ -9545,7 +9799,7 @@ msgstr ""
 "devrait être modifiée et n'est pas modifié automatiquement lors du "
 "renouvellement des abonnements"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/statecollection.tmpl:15
 msgid ""
 "Subscription enddate : must be entered manually when the subscription is "
@@ -9571,7 +9825,7 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:8
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:14
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:10
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:13
 msgid "Subscription information"
 msgstr "Information d'abonnement"
 
@@ -9583,7 +9837,7 @@ msgstr "Bloc d'information d'abonnement"
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-detail.tmpl:9
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:8
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:131
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:80
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:83
 msgid "Subscription length"
 msgstr "Durée d'abonnement"
 
@@ -9599,12 +9853,18 @@ msgstr "Renouvellement d'abonnement"
 msgid "Subscription summary"
 msgstr "Résumé d'abonnement"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:30
+#
+msgid "Subscription(s)"
+msgstr "Abonnement(s)"
+
 #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl:15
 #: ../../koha-tmpl/intranet-tmpl/default/en/modbib.tmpl:38
 msgid "Subtitle"
 msgstr "Sous Titre"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio-nomarc.tmpl:15
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:24
 msgid "Subtitle:"
 msgstr "Sous Titre :"
 
@@ -9656,7 +9916,7 @@ msgstr "R
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:66
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:124
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:126
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:76
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:79
 msgid "Sunday"
 msgstr "Dimanche"
 
@@ -9667,7 +9927,7 @@ msgstr "Divers"
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/histsearch.tmpl:9
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/lateissues.tmpl:7
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:18
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:12
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:15
 msgid "Supplier"
 msgstr "Fournisseur"
 
@@ -9702,6 +9962,7 @@ msgstr "Bar
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/member.tmpl:18
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl:31
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/newmember.tmpl:244
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/member-quicksearch-results.tmpl:11
 msgid "Surname"
 msgstr "Nom de famille"
 
@@ -9737,7 +9998,7 @@ msgstr "Pr
 msgid "System preferences admin"
 msgstr "Gestion des préférences système"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:2
 msgid "System preferences administration"
 msgstr "Gestion des préférences système"
@@ -9778,7 +10039,7 @@ msgid "Tab :%s,"
 msgstr "Onglet :%s,"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:68
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:139
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:140
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/koha2marclinks.tmpl:170
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:68
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:134
@@ -9839,7 +10100,7 @@ msgid ""
 "Text for librarian : what appears before the subfield in the librarian "
 "interface"
 msgstr ""
-"Texte pour les bibliothécaires :  c'est ce qui est affiché avant le sous-"
+"Texte pour les bibliothécaires :  c'est ce qui est affiché avant le sous- "
 "champ dans l'intranet"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:69
@@ -9855,17 +10116,16 @@ msgstr "Texte pour l'OPAC"
 msgid "Text messaging"
 msgstr "Texte de messagerie électronique"
 
-#. %1$s: TMPL_VAR name=textmessaging
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:15
-#, c-format
-msgid "Text messaging: %s"
-msgstr "Texte de messagerie électronique: %s"
+#
+msgid "Text messaging:"
+msgstr "Texte"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:150
+#: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:147
 msgid "Text under label"
 msgstr "Texte sous l'étiquette"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:38
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:40
 msgid "Thanks to"
 msgstr "Merci à"
 
@@ -9879,7 +10139,7 @@ msgstr ""
 "les {} utilisées pour chaque sous-champ.Un champ peut avoir jusqu'à 3 "
 "indicateurs AVANT et jusqu'à 3 indicateurs APRES chaque sous-champ"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl:180
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/jmemberentry.tmpl:78
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl:259
@@ -9912,10 +10172,11 @@ msgstr ""
 "les\"30 jours\"pour le type de document=* est annulé et la durée du prêt est "
 "calculée pour chaque type de document"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:17
-msgid "The <b>Nelsonville Public Library</b> (MARC support)"
-msgstr "La <b>Bibliothèque Publique de Nelsonville</b> (support MARC)"
+#
+msgid "The <b>Nelsonville Public Library</b>, USA, Ohio (MARC support funding)"
+msgstr "La<b>Bibliothèque Publique de Nelsonville</b>, USA, Ohio (financement support MARC)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/user/userpage.tmpl:23
 msgid "The Amazing Apple Book by Paulette Bourgeois"
@@ -9928,12 +10189,14 @@ msgstr "The Great Mom Swap by Betsy Hanes at Main Library"
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/members/members-home.tmpl:4
 msgid "The Members portion stores the information you add about your patrons."
 msgstr ""
+"Le module Lecteurs stocke l'information, concernant vos lecteurs, que vous "
+"ajoutez."
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:27
 msgid "The UNIMARC (partial) definition for ISBD is"
 msgstr "La défintion UNIMARC (partielle) pour l'ISBD est"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:156
+#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:165
 msgid "The barcode is unknown"
 msgstr "Le code à barres est inconnu"
 
@@ -9948,7 +10211,7 @@ msgid "The biography of a grizzly by Ernest Thompson Seton"
 msgstr "The biography of a grizzly by Ernest Thompson Seton"
 
 #. %1$s: TMPL_VAR name=DEBT
-#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:181
+#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:190
 #, c-format
 msgid "The borrower has a debt of %s"
 msgstr "Le lecteur doit %s"
@@ -9959,16 +10222,16 @@ msgid ""
 "change their current password. This is useful to patrons that wish to place "
 "reserves online from home. You cannot see a password again once you change "
 "it, but you can reset a password."
-msgstr ""
+msgstr "Le bouton"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/members/memberentry.tmpl:8
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/members/memberentry.tmpl:15
 msgid ""
 "The clear all Fields button will reset the page to a blank form in case you "
 "made a mistake."
-msgstr ""
+msgstr "Le bouton"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:107
 msgid ""
 "The column <b>Koha field</b> shows that the subfield is linked with a Koha "
@@ -9989,7 +10252,7 @@ msgstr "Le sous-champ DOIT 
 msgid "The different branches you manage with this Koha server."
 msgstr "Les différents sites que vous gérez avec ce serveur Koha"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:153
+#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:162
 msgid "The due date is invalid"
 msgstr "La date de retour est invalide"
 
@@ -10004,10 +10267,10 @@ msgid ""
 "deleting book funds."
 msgstr ""
 "La première fois que vous accéderez à cette page, on vous demandera "
-"d'ajouter votre prmeière ligne de crédit -- après quoi vous aurez aussi le "
+"d'ajouter votre première ligne de crédit -- après quoi vous aurez aussi le "
 "choix d'éditer ou de détruire les lignes de crédit."
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl:17
 msgid ""
 "The following fields have a forbidden value. Correct them and press OK "
@@ -10016,7 +10279,7 @@ msgstr ""
 "Les champs suivants ont des valeurs interdites. Corrigez les et tapez OK à "
 "nouveau :"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/newmember.tmpl:230
 msgid ""
 "The following fields have a forbidden value. Please push the back button and "
@@ -10029,7 +10292,8 @@ msgstr ""
 msgid ""
 "The following fields were entered incorrectly. Please go back and correct "
 "them."
-msgstr "Les champs suivants sont incorrects. Cliquez sur \"retour\" et corrigez les."
+msgstr ""
+"Les champs suivants sont incorrects. Cliquez sur \"retour\" et corrigez les."
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/itemtypes.tmpl:5
 msgid ""
@@ -10045,7 +10309,7 @@ msgstr ""
 "cassettes vidéo dans une catégorie différente des livres documentaires, et "
 "les policiers dans une catégorie différente de celle des livres d'images "
 "pour enfants.Si vous utilisez déjà un SIGB commercial, vous avez "
-"certainement déjà réparti vos collections dans de telles catégories."
+"certainement déjà réparti vos collections dans de telles catégories. "
 "Maintenant vous devez indiquer à Koha quelles sont ces catégories."
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/itemtypes.tmpl:7
@@ -10055,7 +10319,7 @@ msgid ""
 "see."
 msgstr ""
 "Le code de type de document est limité à quatre caractères.Ce code est "
-"rarement affiché par Koha;Les utilisateurs verront à la palce la description "
+"rarement affiché par Koha;Les utilisateurs verront à la place la description "
 "du type de document."
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/statecollection.tmpl:11
@@ -10074,8 +10338,9 @@ msgstr ""
 msgid "The loop is for instance"
 msgstr "La boucle est pour l'instant"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:11
+#
 msgid ""
 "The numbering of issues recieved can be a complex formulas. The \"numbering "
 "formula\" can be filled with any text and/or numbers. 3 special tokens <b>"
@@ -10087,7 +10352,7 @@ msgstr ""
 "b> sont particuliers. Vous pouvez les utiliser pour définir une formule de "
 "calcul. les valeurs de XYZ sont calculées de la manière suivante :"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-detail.tmpl:12
 msgid ""
 "The numbering of items recieved can contain complex formulas. The "
@@ -10108,11 +10373,11 @@ msgid ""
 "menu."
 msgstr ""
 "Le menu déroulant liste les tables Koha qui peuvent recevoir des "
-"informations à partir enregistrements MARC.Les colonnes de chaque table sont "
-"listées en dessous du menu déroulant."
+"informations à partir d'enregistrements MARC.Les colonnes de chaque table "
+"sont listées en dessous du menu déroulant."
 
-#
-#
+# 
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:90
 msgid ""
 "The reservoir is a table where imported MARC records are stored. A MARC "
@@ -10127,7 +10392,7 @@ msgstr ""
 "l'enregistrement est ajouté à la table active de Koha et supprimé du "
 "réservoir"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/help/circ/returns.tmpl:6
+#: ../../koha-tmpl/intranet-tmpl/default/en/help/circ/returns.tmpl:7
 msgid ""
 "The return is done and if there is something specific for the item or the "
 "borrower (like borrower having debts), a red box will warn you"
@@ -10140,22 +10405,22 @@ msgstr ""
 msgid "The right part"
 msgstr "La partie droite"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/statecollection.tmpl:5
 msgid ""
 "The right part deals with issues. When you create a new subscription, the "
 "1st issue is automatically calculated. When you want/need, you can define "
 "issues that have a new status:"
 msgstr ""
-"La partie droite concerne les parutions.Quand vous créer un nouvel "
-"abonnement, le 1er numéro est calculée automatiquement.Lorsque vous  voulez/ "
-"avez besoin,vous pouvez  définir les numeros qui ont un nouveau statut :"
+"La partie droite concerne les parutions.Quand vous créez un nouvel "
+"abonnement, le 1er numéro est calculé automatiquement.Lorsque vous voulez/ "
+"avez besoin,vous pouvez définir les numeros qui ont un nouveau statut :"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/search.marc/search.tmpl:3
 msgid "The search id divided in 2 differents parts :"
 msgstr "La recherche est divisée en deux parties différentes :"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/authtypes.tmpl:7
 msgid ""
 "The summary contains an \"ISBD\" like description to explain how the entry "
@@ -10165,7 +10430,7 @@ msgstr ""
 "les données doivent être affichées dans la liste de résultats.La syntaxe "
 "est :"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/authtypes.tmpl:6
 msgid ""
 "The tag reported must contain a MARC tag number. Every subfield in the "
@@ -10179,7 +10444,7 @@ msgstr ""
 "sera reporté dans le 600, 700, 701...selon ce qui aura été coché dans "
 "l'éditeur MARC."
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl:68
 msgid ""
 "The total at the bottom of the page should be within a few cents of the "
@@ -10190,9 +10455,9 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/search.marc/search.tmpl:5
 msgid "The usual fields are in the top part of the screen. They contains :"
-msgstr "Les champs usuels sont dans la partie haute de l'écran. Ils contiennent :"
+msgstr "Les champs courants sont en haut de l'écran.Ils comprennent :"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl:77
 msgid ""
 "Then select a previous shopping basket or create a new one. Note the basket "
@@ -10228,21 +10493,24 @@ msgstr ""
 "Ce contrôle MARC ne garantie pas que vous apprécierez les premiers résultats "
 "de vos efforts pour régler vos affichagesMARC, etc.--c'est une simple "
 "vérification des erreurs principales.Vous reverrez probablement votre "
-"paramétrage MARC plusieurs fois avant d'en être totalement satisfaits."
+"paramétrage MARC plusieurs fois avant d'en être totalement satisfaits. "
 "Assurez-vous de lancer le contrôle MArc après chaque modification."
 
-#
-#: ../../koha-tmpl/intranet-tmpl/default/en/errors/400.tmpl:15
-#: ../../koha-tmpl/intranet-tmpl/default/en/errors/402.tmpl:15
-#: ../../koha-tmpl/intranet-tmpl/default/en/errors/403.tmpl:15
-#: ../../koha-tmpl/intranet-tmpl/default/en/errors/404.tmpl:15
-#: ../../koha-tmpl/intranet-tmpl/default/en/errors/405.tmpl:15
-msgid "This error means that the link was broken and that the page doesn't exist"
-msgstr "Cette erreur signifie que le lien a été rompu et que la page n'existe plus"
-
-#: ../../koha-tmpl/intranet-tmpl/default/en/errors/401.tmpl:15
+# 
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/400.tmpl:7
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/402.tmpl:7
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/403.tmpl:7
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/404.tmpl:7
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/405.tmpl:7
+msgid ""
+"This error means that the link was broken and that the page doesn't exist"
+msgstr ""
+"Cette erreur signifie que le lien a été rompu et que la page n'existe plus"
+
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/401.tmpl:7
 msgid "This error means that you aren't authorized to view this page"
-msgstr "Cette erreur signifie que vous n'êtes pas autorisé à visualiser cette page"
+msgstr ""
+"Cette erreur signifie que vous n'êtes pas autorisé à visualiser cette page"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/koha2marclinks.tmpl:9
 msgid ""
@@ -10259,16 +10527,22 @@ msgid ""
 "information with no holdings information other than any holdings information "
 "originally loaded into Koha using the bulkmarcimport tool."
 msgstr ""
+"Ceci est un outil pour exporter vos enregistrements bibliographiques au "
+"format standard d'échange MARC (ISO2709).Il exporte seulement les "
+"informations bibliographiques de base sans données exemplaires autres que "
+"toutes les données exemplaires chargées à l'origine dans Koha en utilisant "
+"l'outil \"bulkmarcimport\"."
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/import/breeding.tmpl:3
 msgid ""
 "This is one of the screens you will see frequently if you are starting from "
 "scratch."
 msgstr ""
+"C'est un des écrans que vous verrez fréquemment si vous partez de zéro."
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/members/members-home.tmpl:3
 msgid "This is the Members portion of Koha."
-msgstr ""
+msgstr "C'est le module Lecteurs de Koha."
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/members/memberentry.tmpl:11
 msgid ""
@@ -10276,6 +10550,9 @@ msgid ""
 "group, or lend books to other Libraries. This would be the form to use for "
 "that purpose."
 msgstr ""
+"C'est le formulaire pour ajouter  une collectivité.Supposez que vous ayiez "
+"une Maison des Jeunes, ou que vous prêtiez des livres à une autre "
+"bibliothèque.C'est ce formulaire que vous devrez utiliser dans ce cas."
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/members/memberentry.tmpl:4
 msgid ""
@@ -10284,6 +10561,10 @@ msgid ""
 "organisations you might lend to. You should use the Add Organisation tab at "
 "the top of the Member page for that."
 msgstr ""
+"C'est le formulaire pour ajouter un indivuduel à la base de données.Il y a "
+"aussi un formulaire pour les collectivités, telles que d'autres "
+"bibliothèques ou des associations auquelles vous pouvez faire des prêts.Vous "
+"devrez pour cela utiliser la table"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:3
 msgid ""
@@ -10291,6 +10572,9 @@ msgid ""
 "basic behavior of Koha. These parameters should be set before any other "
 "parameters."
 msgstr ""
+"Cette page vous permet de choisir les préférences système qui contrôlent la "
+"plupart des aspects de Koha.Ces paramètres devraient être fixés avant tous "
+"les autres."
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/user/userpage.tmpl:7
 msgid "This page is just a mock up"
@@ -10303,8 +10587,8 @@ msgid ""
 "can also be done while setting the MARC tag structure, but it is easier to "
 "see the relationship between the MARC database and the Koha database here."
 msgstr ""
-"Cette page fournit une façon simplifiée pour lier vos champs et sous-champs "
-"MARC à la base non MARC de Koha, <b>pour la grille de catalogage par "
+"Cette page fournit une méthode simplifiée pour lier vos champs et sous-"
+"champs MARC à la base non MARC de Koha, <b>pour la grille de catalogage par "
 "défaut<b>.On peut aussi le faire en même temps que l'on définit la structure "
 "des champs MARC, mais il est plus facile de voir les relations entre la base "
 "MARC et la base Koha, ici."
@@ -10333,19 +10617,19 @@ msgstr "Cet 
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/members/moremember.tmpl:3
 msgid "This screen shows the information associated with a given patron."
-msgstr ""
+msgstr "Cet écran affiche l'information concernant un lecteur donné."
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:84
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:106
 msgid ""
 "This screen shows the subfields associated with the selected tag. You can "
 "edit subfields or add a new one by clicking on edit."
 msgstr ""
-"Cet écran montre les sous-champs  associés au champ sélectionné.Vous pouvez "
-"ouvrir les sous-champs ou en ajouter de nouveaux en cliquant sur edit."
+"Cette page montre les sous-champs associés au champ sélectionné.Vous pouvez "
+"éditer les sous-champs ou en ajouter de nouveaux en cliquant sur editer."
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:46
 msgid ""
 "This table is used in MARC definition. You can define as many categories as "
@@ -10362,7 +10646,7 @@ msgstr ""
 msgid "This type only : <b>%s %s</b>"
 msgstr "Uniquement ce type :<b>%s %s</b>"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/maint/catmaintain.tmpl:18
 msgid ""
 "This will change the subject headings on all the biblios this subject is "
@@ -10374,11 +10658,11 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:57
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:109
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:111
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:67
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:70
 msgid "Thursday"
 msgstr "Jeudi"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/modbibitem.tmpl:71
 msgid ""
 "Tick ALL barcodes that changes are to apply too. Those left un-ticked will "
@@ -10395,14 +10679,18 @@ msgstr "Pointez TOUS les codes-barres auquels les changements s'appliquent."
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/cmsdsearchresults.tmpl:7
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/searchresults.tmpl:42
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/branchtransfers.tmpl:128
-#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:236
-#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:265
+#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:245
+#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:274
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl:185
 #: ../../koha-tmpl/intranet-tmpl/default/en/maint/catmaintain.tmpl:35
 #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl:14
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/readingrec.tmpl:15
-#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:119
-#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:169
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:112
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:162
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember-receipt.tmpl:13
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember-receipt.tmpl:29
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember-print.tmpl:16
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember-print.tmpl:41
 #: ../../koha-tmpl/intranet-tmpl/default/en/reports/inventory.tmpl:38
 #: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl:27
 #: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl:140
@@ -10437,7 +10725,7 @@ msgstr "Titre : %s"
 msgid "Title: *"
 msgstr "Titre : *"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:28
 msgid "Titre/auteur"
 msgstr "traducteur"
@@ -10461,6 +10749,8 @@ msgid ""
 "To add a patron, type their name into the search box on the left, and click "
 "the OK button."
 msgstr ""
+"Pour ajouter un lecteur, taper son nom dans la boîte de recherche sur la "
+"gauche et cliquez sur le bouton OK."
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/z3950servers.tmpl:7
 msgid ""
@@ -10471,17 +10761,25 @@ msgid ""
 "listed there accept anonymous connections. (Be sure to choose servers which "
 "deliver records in the proper MARC format for your Koha installation.)"
 msgstr ""
+"Pour ajouter des serveurs, vous aurez besoin de connaître le nom de domaine "
+"ou l'adresse IP du serveur, le numéro de port à utiliser, et le nom de la "
+"base de données à laquelle accéder.Cette information est disponible pour "
+"tous les serveurs du web en se connectant au site web de l'index des bases "
+"de données http://www.indexdata.dk/targettest/.Tous  les serveurs ici "
+"acceptent les connections anonymes.(Assurez-vous de choisir des serveurs qui "
+"fournissent des enregistrements au format MARC adapté avotre installation "
+"Koha)."
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl:79
 msgid ""
 "To close off a shopping basket click on \"view shopping baskets\" or search "
 "above, and then click on \"confirm basket\"."
 msgstr ""
 "Pour fermer un panier de commande cliquez sur \"voir les paniers de commande "
-"\"ou cherchez en dessus, et cliquez alors sur \"confirmer le panier\"."
+"\"ou cherchez au dessus, et cliquez alors sur \"valider le panier\"."
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl:78
 msgid ""
 "To order an item you need to establish whether a biblio already exists for "
@@ -10491,7 +10789,17 @@ msgstr ""
 "existe déjà, puis soit ajouter un exemplaire, soit créer une nouvelle notice "
 "et y ajouter l'exemplaire"
 
-#
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/400.tmpl:8
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/401.tmpl:8
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/402.tmpl:8
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/403.tmpl:8
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/404.tmpl:8
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/405.tmpl:8
+#, c-format
+msgid "To report this error, you can <a1>email the Koha Administrator</a>."
+msgstr "Pour rapporter cette erreur, vous pouvez <a1>envoyer un mail à l'administrateur</a>"
+
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl:76
 msgid ""
 "To start an acquisition, whether an order, local purchase or donation first "
@@ -10500,17 +10808,17 @@ msgstr ""
 "Pour débuter une acquisition, que ça soit une commande, un achat direct ou "
 "un don, rechercher tout d'abord le fournisseur, Ajoutez en un si nécessaire."
 
-#
-#: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:89
+# 
+#: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:88
 msgid "To:"
 msgstr "à :"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:231
+#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:240
 msgid "Todays Issues"
 msgstr "Prêts du jour"
 
 #. %1$s: TMPL_VAR name=TOO_MANY
-#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:196
+#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:205
 #, c-format
 msgid "Too many issues (already issued / max : %s)"
 msgstr "Trop de prêts en cours (prétés/maximum : %s)"
@@ -10531,7 +10839,7 @@ msgid "Total Due"
 msgstr "Total dû"
 
 #. %1$s: TMPL_VAR name=totaldue
-#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:100
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:93
 #, c-format
 msgid "Total due %s"
 msgstr "Total dû %s"
@@ -10560,6 +10868,11 @@ msgstr "Tracey the Great de Alan Cliburn"
 msgid "Transfered Items"
 msgstr "Exemplaires transférés"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:75
+#
+msgid "Translation"
+msgstr "Traduction"
+
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/searchresults.tmpl:101
 #, c-format
 msgid "Try another <a1>search</a>"
@@ -10568,7 +10881,7 @@ msgstr "Essayez une autre <a1>recherche</a>"
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:51
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:99
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:101
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:61
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:64
 msgid "Tuesday"
 msgstr "Mardi"
 
@@ -10583,7 +10896,7 @@ msgstr "Mardi"
 msgid "Type"
 msgstr "Type"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:11
 msgid ""
 "Type a borrower name, part of a name, or number in the field above and hit "
@@ -10598,7 +10911,7 @@ msgstr ""
 msgid "Type in the box and press the enter key."
 msgstr "Saisissez dans le pavé et validez"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:74
+#: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:73
 msgid "Type of Interval"
 msgstr "Type d'intervalle"
 
@@ -10614,13 +10927,14 @@ msgstr "UNIMARC"
 msgid "URL"
 msgstr "URL"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/marctagstructure.tmpl:19
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/marc_subfields_structure.tmpl:19
 msgid "URL : if checked, the subfield is an URL, and can be clicked"
-msgstr "URL si coché, indique que le champ est une URL valide et peut-être cliquée"
+msgstr ""
+"URL si coché, indique que le champ est une URL valide et peut-être cliquée"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem-nomarc.tmpl:23
 msgid "URL:"
 msgstr "URL"
@@ -10638,11 +10952,20 @@ msgstr "Reprendre Notice"
 msgid "Unititle"
 msgstr "Titre uniforme"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:39
+#
+msgid "Unititle:"
+msgstr "Titre uniforme"
+
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:72
+msgid "Universidad ORT Uruguay (Ernesto Silva, Andres Tarallo)"
+msgstr "Université ORT Uruguay (Ernesto Silva, Andres Tarallo)"
+
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:32
 msgid "Unknown"
 msgstr "Inconnu"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/biblio_framework.tmpl:4
 msgid ""
 "Unlike Koha 2.0, in this version you can have more than 1 framework to "
@@ -10650,12 +10973,12 @@ msgid ""
 "framework for monographies, 1 framework for serials, 1 framework for URL..."
 msgstr ""
 "Contrairement à Koha 2.0, dans cette version, vous pouvez avoir plus d'un "
-"framework pour cataloguer différents types de documents pouvez, par exemple, "
-"définir un framework pour les monographies, un pour les périodiques, un pour "
-"les URL..."
+"framework pour cataloguer différents types de document.Vous pouvez, par "
+"exemple, définir une grille  pour les monographies, une pour les "
+"périodiques, une pour les URL..."
 
 #. INPUT type=submit name=submit
-#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:146
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:139
 msgid "Update"
 msgstr "Mettre à Jour"
 
@@ -10686,7 +11009,7 @@ msgstr "Mise 
 msgid "Upload MARC Records"
 msgstr "Importer des enregistrements MARC"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:89
 msgid "Upload MARC records in reservoir"
 msgstr "Chargez les enregistrements MARC dans le réservoir"
@@ -10707,7 +11030,7 @@ msgid "Upper Age Limit"
 msgstr "Limite d'âge supérieure"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/categorie.tmpl:17
-#, fuzzy
+#
 msgid "Upper Age Limit and Age Required"
 msgstr "Limite d'âge supérieure"
 
@@ -10719,6 +11042,11 @@ msgid ""
 "\"18.\" If there is no upper age limit, set this value to 99 (the highest "
 "allowed)."
 msgstr ""
+"La limite d'âge supérieure et l'âge requis fixent les critères d'âge pour "
+"ce type de lecteur.Si vous délivrez des cartes enfants pour les lecteurs "
+"entre 2 et 18 ans, par exemple, alors l'âge requis sera\"2\" et la limite "
+"d'âge supérieure \"18.\"S'il n'y a pas d'âge limite supérieure, fixez cette "
+"valeur à 99 (la plus grande valeur autorisée)."
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:105
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:179
@@ -10727,17 +11055,19 @@ msgstr ""
 msgid "Upperage limit"
 msgstr "Limite d'âge supérieure"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/errors/400.tmpl:16
-#: ../../koha-tmpl/intranet-tmpl/default/en/errors/401.tmpl:16
-#: ../../koha-tmpl/intranet-tmpl/default/en/errors/402.tmpl:16
-#: ../../koha-tmpl/intranet-tmpl/default/en/errors/403.tmpl:16
-#: ../../koha-tmpl/intranet-tmpl/default/en/errors/404.tmpl:16
-#: ../../koha-tmpl/intranet-tmpl/default/en/errors/405.tmpl:16
-#: ../../koha-tmpl/intranet-tmpl/default/en/errors/500.tmpl:17
-msgid "Use top menu bar to navigate again in koha."
-msgstr "Utilisez la barre de menu principale pour naviguer à nouveau dans Koha."
-
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/400.tmpl:9
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/401.tmpl:9
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/402.tmpl:9
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/403.tmpl:9
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/404.tmpl:9
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/405.tmpl:9
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/500.tmpl:10
 #
+msgid "Use top menu bar to navigate to another part of Koha."
+msgstr ""
+"Utilisez la barre de menu principale pour naviguer à nouveau dans Koha."
+
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl:68
 msgid ""
 "Use your reload button to get the most recent figures. Committed figures are "
@@ -10756,7 +11086,7 @@ msgstr "Utilis
 msgid "Used X times"
 msgstr "Utilisé X fois"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist.tmpl:38
 msgid "Used in"
 msgstr "Utilisé"
@@ -10774,7 +11104,7 @@ msgstr "Identifiant Utilisateur"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/search.marc/search.tmpl:4
 msgid "Usual fields"
-msgstr "Champs usuels"
+msgstr "Champs courants"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/newimember.tmpl:170
 msgid "Valid values. click OK to confirm this new borrower"
@@ -10816,7 +11146,8 @@ msgstr ""
 #. %1$S: type=text name=preftype
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl:100
 #, c-format
-msgid "Variable type: %S (Choice, YesNo,Integer,Textarea,Float,Themes,Languages)"
+msgid ""
+"Variable type: %S (Choice, YesNo,Integer,Textarea,Float,Themes,Languages)"
 msgstr ""
 "Type de variable : %S  (Choice, YesNo,Integer,Textarea,Float,Themes, "
 "Languages)"
@@ -10852,7 +11183,7 @@ msgstr "Etag
 msgid "Virtual shelves"
 msgstr "Etagères Virtuelles"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl:82
 msgid ""
 "Virtual shelves can be used by librarian or patrons to build virtual "
@@ -10868,7 +11199,7 @@ msgstr ""
 "l'utiliser  dans une bibliothèque pour indiquer des listes de documents (les "
 "plus empruntés, les plus représentatifs...)."
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:48
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:64
 #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl:21
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/readingrec.tmpl:27
 #: ../../koha-tmpl/intranet-tmpl/default/en/modbibitem.tmpl:49
@@ -10894,11 +11225,14 @@ msgstr "Volume :"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:236
 msgid "WARNING : you must have a categorycode = C for children"
-msgstr "ATTENTION : vous devez créer un code de catégorie = E pour les enfants"
+msgstr ""
+"ATTENTION : pour les enfants vous devez utiliser le code de catégorie = C "
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:241
 msgid "WARNING : you must have a categorycode = I for Institutions"
-msgstr "ATTENTION : vous devez créer un code de catégorie = C pour les Collectivités"
+msgstr ""
+"ATTENTION : pour les collectivités vous devez utiliser le code de catégorie "
+"= I"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl:4
 msgid "WELCOME TO THE KOHA INTRANET"
@@ -10908,12 +11242,17 @@ msgstr "BIENVENUE DANS L'INTRANET KOHA"
 msgid "WELCOME TO THE KOHA OPAC"
 msgstr "BIENVENUE DANS L'OPAC DE KOHA"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/errors/500.tmpl:16
-msgid "Wait for a better version or mail the mainteners"
-msgstr "Attendez une meilleure version ou envoyez un mail à la maintenance"
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/500.tmpl:9
+#, c-format
+msgid ""
+"Wait while system maintenance is being done or <a1>email the Koha "
+"Administrator</a>."
+msgstr ""
+"Attendes que la maintenance soit terminée, ou <a1>envoyez un mail à "
+"l'administrateur Koha</a>."
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl:39
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:158
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:161
 msgid "Waited"
 msgstr "Attendu"
 
@@ -10923,7 +11262,7 @@ msgstr "Attendu"
 msgid "Waiting"
 msgstr "En attente"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl:128
 msgid ""
 "Warning : the \"contains\" statement does NOT work if you enter 2 or less "
@@ -10934,7 +11273,7 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl:36
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail-opac.tmpl:58
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:68
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:84
 msgid "Website"
 msgstr "Site Web"
 
@@ -10949,12 +11288,12 @@ msgstr "URL du site Web"
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:54
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:104
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:106
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:64
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:67
 msgid "Wednesday"
 msgstr "Mercredi"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:169
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:116
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:119
 msgid "When more than"
 msgstr "Quand supérieur à"
 
@@ -10966,9 +11305,9 @@ msgstr "Quand sup
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/members/memberentry.tmpl:7
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/members/memberentry.tmpl:14
 msgid "When you are done with the record, click the Save button at the bottom."
-msgstr ""
+msgstr "Lorsque vous avez terminé l'enregistrement cliquez sur le bouton"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:47
 msgid ""
 "When you define the MARC subfield structure, you can link a subfield to an "
@@ -10983,7 +11322,7 @@ msgstr ""
 msgid "When you have finished this invoice save the changes."
 msgstr "Lorsque vous aurez fini cette facture, sauvez les modifications."
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/searchresults.tmpl:65
 msgid "Withdrawn"
 msgstr "Exemplaire retiré"
@@ -10998,7 +11337,7 @@ msgstr "Mot"
 msgid "Words deleted during searches."
 msgstr "Mots ignorés lors de la recherche"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl:134
 msgid ""
 "Work at the front desk on Issues and returns using only a barcode reader and "
@@ -11015,7 +11354,7 @@ msgstr "pertes et profits"
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:159
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl:166
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:72
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:93
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:94
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:39
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:103
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:80
@@ -11035,16 +11374,21 @@ msgstr "pertes et profits"
 msgid "YES"
 msgstr "OUI"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:122
+#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:131
 msgid "Year"
 msgstr "Année"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:136
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:151
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:37
+#
+msgid "Year :"
+msgstr "Année"
+
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:129
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:152
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:153
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:127
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:192
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:274
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:271
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:146
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:147
 msgid "Yes"
@@ -11067,9 +11411,10 @@ msgstr "Vous cherchiez %s"
 msgid "You Searched for <b>%s</b>"
 msgstr "Vous cherchiez <b>%s</b>"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:24
-msgid "You also must have selected a supplier if you want to ask for late issues"
+msgid ""
+"You also must have selected a supplier if you want to ask for late issues"
 msgstr ""
 "Vous devez sélectionner un fournisseur si vous souhaitez réclamer les "
 "numéros en retard"
@@ -11084,6 +11429,9 @@ msgid ""
 "number for the export. If you want to export all of your records, leave the "
 "start and end numbers blank."
 msgstr ""
+"On vous demande de fournir un numero d'enregistrement de début et de fin "
+"pour l'esportation.Si vous voulez exporter tous vos enregistrements, laissez "
+"les numeros de début et de fin en blanc."
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/import/breeding.tmpl:9
 msgid ""
@@ -11091,8 +11439,11 @@ msgid ""
 "than 1 imported biblio (or just want to keep trace on where the biblios "
 "comes from)"
 msgstr ""
+"Vous pouvez donner un nom à l'importation pour vous aider quand vous devez "
+"choisir entre plusieurs notices importées (ou simplement pour garder la "
+"trace de la provenance des notices)"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/import/breeding.tmpl:10
 msgid "You can also change char encoding between MARC21 and UNIMARC"
 msgstr "Codage des caractères (MARC21 ou UNIMARC)"
@@ -11104,6 +11455,8 @@ msgid ""
 "selecting a user by clicking on the entry in the search list, and then "
 "clicking the Modify button on the member information screen."
 msgstr ""
+"Vous pouvez toujours retourner en arrière et éditer ce que vous avez entré "
+"dans l'écran"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/authtypes.tmpl:3
 msgid "You can define as many Authority types as you want."
@@ -11119,8 +11472,10 @@ msgid ""
 "You can define as the marc tag structure for each biblio framework you have "
 "defined"
 msgstr ""
+"Vous pouvez définir la structure des champs Marc pour chaque grille de "
+"catalogage que vous avez spécifiée."
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/marcimport.tmpl:24
 #: ../../koha-tmpl/intranet-tmpl/default/en/import/breeding.tmpl:18
 msgid ""
@@ -11136,6 +11491,8 @@ msgid ""
 "You can get information on what a patron has read in the past by clicking on "
 "the Reading Record button."
 msgstr ""
+"Vous pouvez avoir des informations sur ce qu'un lecteur a lu auparavant en "
+"cliquant sur le bouton"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/searchresults.tmpl:12
 msgid "You did not specify any seach criteria"
@@ -11147,6 +11504,10 @@ msgid ""
 "this box if you don't want to. It is useful for telling imports apart if "
 "you've more than one of the same record."
 msgstr ""
+"Vous n'avez pas vraiment besoin de donner un nom à chaque importation, ainsi "
+"vous n'êtes pas obligé de remplir le pavé si vous ne le souhaitez pas.C'est "
+"utile de donner un nom aux importations si vous avez plus d'une fois le même "
+"enregistrement."
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/auth.tmpl:20
 msgid "You entered an incorrect username or password. Please try again."
@@ -11164,9 +11525,10 @@ msgstr ""
 "Vous avez <b>%s</b> erreur(s) dans votre configuration MARC.SVP corrigez les "
 "avant d'utiliser Koha"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/member-password.tmpl:9
-msgid "You have entered a UserID that already exists. Please choose another one."
+msgid ""
+"You have entered a UserID that already exists. Please choose another one."
 msgstr ""
 "Vous avez saisi un nom d'utilisateur qui existe déjà. Merci de choisir un "
 "autre nom."
@@ -11265,7 +11627,7 @@ msgstr "Serveurs Z39.50"
 msgid "Z39.50 Servers admin"
 msgstr "Gestion des serveurs Z39.50"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/z3950servers.tmpl:2
 msgid "Z39.50 servers administration"
 msgstr "Gestion des serveurs Z39.50"
@@ -11291,7 +11653,7 @@ msgstr "Code Postal / Ville*"
 msgid "[Viewing %s to %s of %s records] %s"
 msgstr "[Visualisation de %s à %s de %s enregistrements] %s"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/authtypes.tmpl:9
 msgid ""
 "[xxxFFFSyyy] where xxx are up to 3 digits BEFORE the field, FFF the field "
@@ -11318,7 +11680,7 @@ msgstr "ajouter"
 msgid "and"
 msgstr "et"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:33
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:30
 msgid ""
 "and Simon Blake, Amanda Atkins, Operations Manager, Olwen Williams, Finlay "
 "Thompson,"
@@ -11444,8 +11806,8 @@ msgstr "D
 msgid "categorycode missing"
 msgstr "code catégorie absent"
 
-#
-#
+# 
+# 
 #. INPUT type=submit
 #: ../../koha-tmpl/intranet-tmpl/default/en/suggestion/acceptorreject.tmpl:42
 msgid "change status"
@@ -11525,6 +11887,11 @@ msgstr "supprimer"
 msgid "description missing"
 msgstr "description manquante"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:51
+#
+msgid "doXulting (Matthieu Branlat) OPAC basket"
+msgstr "doXulting (Matthieu Branlat) panier OPAC"
+
 #. IMG
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl:226
 msgid "edit"
@@ -11532,22 +11899,20 @@ msgstr "Ouvrir"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/charges.tmpl:7
 msgid "eg 1,7,7 = $1 fine, after 7 days, every 7 days."
-msgstr "par exemple 1,7,7 signifie 1EUR d'amende, après 7 jours, tous les 7 jours."
+msgstr ""
+"par exemple 1,7,7 signifie 1EUR d'amende, après 7 jours, tous les 7 jours."
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/issuingrules.tmpl:10
 msgid "eg 1,7,7 = 1USD,EUR,etc fine, after 7 days, every 7 days"
-msgstr "par ex. 1,7,7 = 1Eur d'amende, au bout de 7 jours, par tranche de 7 jours"
+msgstr ""
+"par ex. 1,7,7 = 1Eur d'amende, au bout de 7 jours, par tranche de 7 jours"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-detail.tmpl:22
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:22
 msgid "empty"
 msgstr "vide"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/issuingrules.tmpl:7
-msgid "eq 21,5 enables 5 issues for 21 days"
-msgstr "égal à 21,5 permet 5 prêts pour une durée de 21 jours"
-
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl:31
 msgid "est"
 msgstr "estimé"
@@ -11582,8 +11947,8 @@ msgstr "pour le site = %s"
 msgid "for category = %s"
 msgstr "pour la catégorie = %s"
 
-#
-#: ../../koha-tmpl/intranet-tmpl/default/en/help/search.marc/search.tmpl:25
+# 
+#: ../../koha-tmpl/intranet-tmpl/default/en/help/search.marc/search.tmpl:26
 msgid ""
 "for performance reasons, the * is valid only if you enter a word more than 3 "
 "letters long. for words of 3 letters or less, the * is"
@@ -11608,7 +11973,7 @@ msgstr "A partir d'une notice existante"
 
 #. %1$S: type=text name=start_bib
 #. %2$S: type=text name=end_bib
-#: ../../koha-tmpl/intranet-tmpl/default/en/export/marc.tmpl:7
+#: ../../koha-tmpl/intranet-tmpl/default/en/export/marc.tmpl:8
 #, c-format
 msgid "from biblio number : %S to biblio number : %S"
 msgstr "de la notice : %S à  la notice : %S"
@@ -11651,12 +12016,12 @@ msgstr "serveur manquant"
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=url
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail-opac.tmpl:64
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:73
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:89
 #, c-format
 msgid "http://%s"
 msgstr "http://%s"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl:86
 msgid ""
 "if checked, no item of this type can be issued. If not checked, every item "
@@ -11666,10 +12031,15 @@ msgstr ""
 "documents de ce type pourront être prêtés sauf si l'option exclu du prêt est "
 "choisie pour un exemplaire précis."
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/help/search.marc/search.tmpl:25
+#: ../../koha-tmpl/intranet-tmpl/default/en/help/search.marc/search.tmpl:26
 msgid "ignored"
 msgstr "ignoré"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:28
+#
+msgid "in"
+msgstr "S'inscrire"
+
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=publicationyear
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/suggestion-select.tmpl:39
@@ -11693,7 +12063,7 @@ msgstr "est une URL"
 msgid "iso 2709 export"
 msgstr "export iso2709"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-detail.tmpl:6
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:5
 msgid ""
@@ -11716,6 +12086,8 @@ msgid ""
 "it's divided into blocks, that can contain a text before, X fields, each "
 "having -or not- a string before, a string after, and a text after :"
 msgstr ""
+"c'est divisé en blocs, qui peuvent contenir un texte avant,  X champs,ayant- "
+"ou pas- une chaîne avant, une chaîne après, et un texte après :"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:26
 msgid "item fields"
@@ -11747,7 +12119,7 @@ msgstr "Table types de document remplie avec au moins une valeur"
 msgid "lib"
 msgstr "lib"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/marctagstructure.tmpl:23
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/marc_subfields_structure.tmpl:23
 msgid "link : useless for instance"
@@ -11758,11 +12130,11 @@ msgstr "La boucle est pour l'instant"
 msgid "login"
 msgstr "Se connecter"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/help/search.marc/search.tmpl:20
+#: ../../koha-tmpl/intranet-tmpl/default/en/help/search.marc/search.tmpl:21
 msgid "lower*"
 msgstr "inférieur*"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/help/search.marc/search.tmpl:20
+#: ../../koha-tmpl/intranet-tmpl/default/en/help/search.marc/search.tmpl:21
 msgid "means : find biblio that have a"
 msgstr "signifie : trouver les notices qui ont un"
 
@@ -11772,6 +12144,8 @@ msgid ""
 "and 995k, repeated for each item (995 is an UNIMARC standard), then nothing "
 "after the block."
 msgstr ""
+"Signifie que le \"bloc\"995 a <br>Items :AVANT, les champs 995b, 995j, 995k, "
+"répétés pour chaque exemplaire, puis rien après le bloc."
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl:49
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl:33
@@ -11786,12 +12160,12 @@ msgstr "mois"
 
 #. INPUT type=image
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:134
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:172
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:173
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:80
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:151
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl:158
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/biblio_framework.tmpl:137
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:157
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:155
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:168
 msgid "next"
 msgstr "suivant"
@@ -11813,19 +12187,20 @@ msgstr "le"
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:22
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:23
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:163
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:110
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:113
 msgid "once every"
 msgstr "toutes les"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-detail.tmpl:15
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:14
-msgid "once every : the number before can be added on every issue or less often"
+msgid ""
+"once every : the number before can be added on every issue or less often"
 msgstr ""
 "toutes les : le nombre avant peut être ajouter à chaque parution ou moins "
 "souvent"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-detail.tmpl:10
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:9
 msgid ""
@@ -11835,7 +12210,7 @@ msgstr ""
 "Un champ de ce bloc doit être rempli : la durée de l'abonnement peut être "
 "calculée en semaines, mois ou nombre de numéros à recevoir"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/statecollection.tmpl:18
 msgid ""
 "opac note : the field that appears in the OPAC (with some other subscription "
@@ -11846,7 +12221,7 @@ msgstr ""
 "informations sur l'abonnement comme la date de début et de fin).Ce champ "
 "doit être rempli manuellement.Rien n'est mis ici automatiquement"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/statecollection.tmpl:19
 msgid ""
 "opac note : the field that appears in the librarian interface (with some "
@@ -11913,7 +12288,12 @@ msgid ""
 "can \"magically\" find the editor from an ISBN, and the collection list for "
 "the editor)"
 msgstr ""
+"module d'extension : signifie que la valeur est calculée ou gérée par un "
+"module d'extension.Par exemple, dans UNIMARC il y a des modules d'extension "
+"pour chaque champ 1xx, qui sont des champs codés.Le module d'extension est "
+"une aide considérable pour le catalogueur!"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/quicksearch-top.inc:5
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/popup-top.inc:5
 msgid "popup"
 msgstr "fenêtre contextuelle"
@@ -11930,12 +12310,12 @@ msgstr "port doit 
 
 #. INPUT type=image
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:130
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:167
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:168
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:75
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:150
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl:157
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/biblio_framework.tmpl:136
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:153
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:151
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:163
 msgid "previous"
 msgstr "précédent"
@@ -11973,7 +12353,7 @@ msgstr "le rang doit 
 msgid "receive"
 msgstr "Réceptionner"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:23
 msgid ""
 "remember you <b>must</b> have created a biblio <b>before</b> creating a "
@@ -11989,6 +12369,8 @@ msgid ""
 "separate the values by a | in the MARC editor when you want to have the "
 "subfield twice"
 msgstr ""
+"répétable : peut être répété ou non.S'il est répétable, séparez les valeurs "
+"par un | dans l'éditeur MARC quand vous voulez doubler le sous-champ"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/authtypes.tmpl:11
 msgid "repeatable fields are manages."
@@ -12063,7 +12445,7 @@ msgstr "date de d
 msgid "subfield ignored"
 msgstr "sous-champ ignoré"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:154
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:155
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:149
 msgid "subfields"
 msgstr "sous-champs"
@@ -12071,7 +12453,7 @@ msgstr "sous-champs"
 #. INPUT type=submit name=submit
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/newjmember.tmpl:96
 msgid "submit"
-msgstr "soumettre"
+msgstr "valider"
 
 #. %1$s: TMPL_VAR name=bibliotitle
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-renew.tmpl:4
@@ -12100,6 +12482,7 @@ msgstr "
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-top.inc:7
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc:5
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/circulation-top.inc:6
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/quicksearch-top.inc:6
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/members-top.inc:7
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/opac-top.inc:7
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/auth-top.inc:6
@@ -12119,9 +12502,10 @@ msgstr "
 msgid "text/html; charset=iso-8859-1"
 msgstr "text/html; charset=iso-8859-1"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:97
-msgid "the barcode generator deals with generating barcodes for items you acquire"
+msgid ""
+"the barcode generator deals with generating barcodes for items you acquire"
 msgstr ""
 "Le générateur de code-barres génère les étiquettes pour les documents que "
 "vous achetez"
@@ -12143,7 +12527,7 @@ msgstr "Le sous-champ correspondant doit avoir une valeur autoris
 msgid "the correspounding subfield MUST have authorised_value=\"itemtype\""
 msgstr "le sous-champ correspondant doit avoir une valeur autorisée="
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:45
 msgid ""
 "the frameworks defined for the MARC editor. Create frameworks, then define "
@@ -12171,7 +12555,7 @@ msgstr ""
 msgid "the koha-DB field linked to this subfield"
 msgstr "Le champ Koha lié à ce sous-champ"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/statecollection.tmpl:12
 msgid ""
 "the left part contains 6 differents informations, that are automatically "
@@ -12210,7 +12594,7 @@ msgstr "Titre"
 msgid "title %s"
 msgstr "titre %s"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/help/search.marc/search.tmpl:20
+#: ../../koha-tmpl/intranet-tmpl/default/en/help/search.marc/search.tmpl:21
 msgid "title containing a word starting by lower"
 msgstr "titre contient un mot commençant par lower"
 
@@ -12221,7 +12605,7 @@ msgstr "titre contient un mot commen
 msgid "upperagelimit is not a number"
 msgstr "L'âge limite supérieur n'est pas un nombre"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:143
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:144
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:138
 msgid "value"
 msgstr "valeur"
@@ -12261,7 +12645,7 @@ msgstr "semaine"
 msgid "will result in the following issues numbers :"
 msgstr "Donnera les numéros de parution suivants"
 
-#
+# 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/authtypes.tmpl:5
 msgid ""
 "with the MARC structure button, you can define the MARC structure of a given "
@@ -12288,4 +12672,5 @@ msgid ""
 "|{700a}{701a}{702a}| ; #200||{200a}{ [200b] }{. 200c}{ : 200e}{. 200h}{. "
 "200i}{ / 200f}{ ; 200g}|"
 msgstr ""
-
+"|{700a}{701a}{702a}| ; #200||{200a}{ [200b] }{. 200c}{ : 200e}{. 200h}{. "
+"200i}{ / 200f}{ ; 200g}|"
diff --git a/misc/translator/po/default_intranet_zh_TW.po b/misc/translator/po/default_intranet_zh_TW.po
index 7d5085cfe0..674baf9f22 100644
--- a/misc/translator/po/default_intranet_zh_TW.po
+++ b/misc/translator/po/default_intranet_zh_TW.po
@@ -24,8 +24,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Koha INTRANET 2.1cvs\n"
-"POT-Creation-Date: 2004-12-30 04:23-0500\n"
+"Project-Id-Version: Koha INTRANET 2.2.1cvs\n"
+"POT-Creation-Date: 2005-01-24 02:10-0500\n"
 "PO-Revision-Date: 2004-02-23 17:20-0500\n"
 "Last-Translator: Ambrose Li <acli@ada.dhs.org>\n"
 "Language-Team: Chinese <zh@li.org>\n"
@@ -58,8 +58,9 @@ msgstr "\"<a1>%s\"</a>"
 msgid ""
 "\"A\" (Adult) and \"W\" can be linked as \"guarantors\" to other borrowers "
 "who are their dependents."
-msgstr ""
+msgstr "讀者類別「A」（成人）及「W」可以作為其他讀者的「擔保人」，如果該等讀者為他們的受養人。"
 
+#  FIXME horrible translation
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/aqbookfund.tmpl:9
 msgid ""
 "\"Book Funds\" are accounts that you establish to keep track of your "
@@ -68,34 +69,35 @@ msgid ""
 "budget. For instance, if your library establishes a budget line for books, "
 "another for audiovisual materials, a third line for magazines, and a fourth "
 "budget line for electronic databases, then you would have four Book Funds."
-msgstr ""
+msgstr "「書籍採購資金」是一種您自行建立的賬戶，用以記錄採購圖書資料所用的支出；「書籍採購資金」可用於任何類型的資料（不僅是書籍），但應該對應圖書館的預算的支出項目。"
+"例如，若果您的圖書館有一個採購書籍的預算、一個採購影視資料的預算、一個採購雜誌的預算、及一個採購電子資料庫的預算，您更應該建立四個「書籍採購資金」。"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/categorie.tmpl:11
 msgid "\"C\" (Children) is a borrower category that has a \"guarantor\""
-msgstr ""
+msgstr "讀者類別「C」（兒童）必須有「擔保人」"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/categorie.tmpl:9
 msgid ""
 "\"I\" can be used for institutional members, like other libraries that "
 "borrow from you, in which case Koha expects slightly different information "
 "about the institution;"
-msgstr ""
+msgstr "讀者類別「I」表示讀者乃一個機構，例如會向您借書的其他圖書館。Koha 對於此等機構會要求輸入稍為不同的資料。"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/itemtypes.tmpl:11
 msgid ""
 "\"Renewals allowed\" says how many times an items of this type may be "
 "renewed."
-msgstr ""
+msgstr "「可續借次數」是讀者可以續借這一類的圖書資料多少次"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/itemtypes.tmpl:9
 msgid ""
 "\"Rental charge\" is any amount you might charge to users for borrowing "
 "items of a certain type (like videos)."
-msgstr ""
+msgstr "「借書費用」是假如您打算借出某類圖書資料（例如錄影資料）時需要收取某個數額的費用時，打算收取的費用"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:31
 msgid "#205||{ ; 205a}{ , 205b}{ = 205d}{ / 205f}{ ; 205g}|"
-msgstr ""
+msgstr "#205||{ ; 205a}{ , 205b}{ = 205d}{ / 205f}{ ; 205g}|"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:32
 msgid ""
@@ -105,7 +107,7 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:33
 msgid "#210|(|{210e}{(210f)}{ : 210g}{, 210h}|)"
-msgstr ""
+msgstr "#210|(|{210e}{(210f)}{ : 210g}{, 210h}|)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:34
 msgid ""
@@ -121,7 +123,7 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:30
 msgid "#230||{ ; 230a}|"
-msgstr ""
+msgstr "#230||{ ; 230a}|"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:36
 msgid ""
@@ -131,7 +133,7 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:28
 msgid "#700|"
-msgstr ""
+msgstr "#700|"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:37
 msgid "#995|&lt;br&gt;Exemplaires :|{\\n995b}{ - 995j}{/995k}|"
@@ -149,13 +151,13 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:26
 #, c-format
 msgid "%S (example for 200a : '200c','200d','200e')"
-msgstr ""
+msgstr "%S (以 200a 而言，例如：「200c」、「200d」、「200e」)"
 
 #. %1$S: type=text name=seealso
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:28
 #, c-format
 msgid "%S (example for 200a : '200c','200d','200e'...)"
-msgstr ""
+msgstr "%S (以 200a 而言，例如：「200c」、「200d」、「200e」……)"
 
 #. For the first occurrence,
 #. %1$S: type=text name=indicator
@@ -171,22 +173,22 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl:317
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl:348
 #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/authorities.tmpl:27
-#, fuzzy, c-format
+#, c-format
 msgid "%S - %s"
-msgstr "%s - %s"
+msgstr "%S - %s"
 
 #  NOTE 譯文更動 by Arthur
 #. %1$S: type=text name=value
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/auth-top.inc:75
-#, fuzzy, c-format
+#, c-format
 msgid "%S <a1> Search </a>"
-msgstr "<b>新的搜尋：</b>%S"
+msgstr "%S <a1> 搜尋 </a>"
 
 #. %1$S: type=text name=pageType
-#: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:142
+#: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:139
 #, c-format
 msgid "%S <a1>[Go to Printer Configuration]</a>"
-msgstr ""
+msgstr "%S <a1>[往印表機設定]</a>"
 
 #. %1$S: type=text name=pagesize
 #. %2$S: type=text name=offset
@@ -205,10 +207,10 @@ msgid ""
 msgstr ""
 
 #. %1$S: type=text name=text_under_label
-#: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:152
+#: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:149
 #, c-format
-msgid "%S If this field is empty, author and title will be put instead"
-msgstr ""
+msgid "%S If this field is empty, author and title will be used instead"
+msgstr "%S 如果留空這欄，將會改用著者及題名欄"
 
 #. For the first occurrence,
 #. %1$S: type=text name=enrolmentperiod
@@ -216,20 +218,21 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:113
 #, c-format
 msgid "%S year(s)"
-msgstr ""
+msgstr "%S å¹´"
 
 #. %1$S: type=text name=upperagelimit
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:107
 #, c-format
 msgid "%S years"
-msgstr ""
+msgstr "%S å¹´"
 
+# XXX
 #. %1$p: type=radio name=label value=<!-- TMPL_VAR NAME="tagname" -->
 #. %2$s: TMPL_VAR name=labelname
-#: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:166
+#: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:162
 #, c-format
 msgid "%p Label %s"
-msgstr ""
+msgstr "%p 標籤 %s"
 
 #. %1$p: type=radio name=existing value=YES
 #: ../../koha-tmpl/intranet-tmpl/default/en/modbibitem.tmpl:9
@@ -329,6 +332,14 @@ msgstr "%p是 %p否"
 msgid "%s %s %s, %s"
 msgstr "%s %s %s, %s"
 
+#. %1$s: TMPL_VAR name=firstname
+#. %2$s: TMPL_VAR name=surname
+#. %3$s: TMPL_VAR name=cardnumber
+#: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:35
+#, c-format
+msgid "%s %s (%s)"
+msgstr "%s %s (%s)"
+
 #. %1$s: TMPL_VAR name=shelfname
 #. %2$s: TMPL_VAR name=shelfbookcount
 #: ../../koha-tmpl/intranet-tmpl/default/en/shelves.tmpl:78
@@ -364,8 +375,8 @@ msgstr "%s (%s) %s"
 #  NOTE 譯文更動 by Arthur
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=authorised_value
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:73
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:73
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:73
 #, c-format
 msgid ""
 "%s (if you select a value here, the indicators will be limited to the "
@@ -377,21 +388,21 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:40
 #, c-format
 msgid "%s (ignore means that the subfield is NOT managed by Koha)"
-msgstr ""
+msgstr "%s (「ignore」表示 Koha 將不會管理這個分欄)"
 
 #. %1$s: TMPL_VAR name=subfield
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem.tmpl:39
-#, fuzzy, c-format
+#, c-format
 msgid "%s -"
-msgstr "%s - %s"
+msgstr "%s -"
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=title
 #. %2$s: TMPL_VAR name=author
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/suggestion-select.tmpl:33
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:47
-#: ../../koha-tmpl/intranet-tmpl/default/en/modbibitem.tmpl:16
 #: ../../koha-tmpl/intranet-tmpl/default/en/suggestion/acceptorreject.tmpl:24
+#: ../../koha-tmpl/intranet-tmpl/default/en/modbibitem.tmpl:16
 #, c-format
 msgid "%s - %s"
 msgstr "%s - %s"
@@ -413,17 +424,18 @@ msgstr "%s - 收貨"
 
 #. %1$s: TMPL_VAR name=used
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/searchresultlist.tmpl:41
-#, fuzzy, c-format
+#, c-format
 msgid "%s <a1>...</a>"
-msgstr "%S - %s <a1>+</a>"
+msgstr "%s <a1>...</a>"
 
 #. %1$s: TMPL_VAR name=about
 #: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:4
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s <h1>Data about the current version of Koha for bug reports (or general "
 "interest).</h1>"
-msgstr "有關這個Koha版本的資料 (報告錯誤用的資訊以及其他一般的資訊)："
+msgstr ""
+"%s <h1>有關這套 Koha 的資料（包括錯誤回報用的以及一般資訊性的資料）：</h1>"
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=biblioitemnumber
@@ -437,34 +449,36 @@ msgstr "%s 群組 - %s"
 
 #. %1$s: TMPL_VAR name=issuecount
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:45
-#, fuzzy, c-format
+#, c-format
 msgid "%s Issues"
-msgstr "借出"
+msgstr "借出 %s 次"
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=isurl
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:42
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:39
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:42
 #, c-format
 msgid ""
 "%s URL (if checked, it means that the subfield is an URL and can be clicked"
-msgstr ""
+msgstr "%s 網址 (如被點選，即表示此分欄為可點擊的網址"
 
 #. %1$s: TMPL_VAR name=used
 #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist.tmpl:45
-#, fuzzy, c-format
+#, c-format
 msgid "%s biblio(s)"
-msgstr "新增書目"
+msgstr "%s 個書目記錄"
 
+#  FIXME poor translation
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=hidden
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:41
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:38
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:41
 #, c-format
 msgid ""
 "%s hidden (subfield is managed, but hidden. -should be filled by a plugin or "
 "thesaurus-)"
 msgstr ""
+"%s 隱藏（分欄會被管理，但不會顯示；其值應由模組或同義字典填寫）"
 
 #  NOTE 譯文更動 by Arthur
 #. For the first occurrence,
@@ -487,21 +501,21 @@ msgstr "%s 已在資料庫內，既有的書目號碼為 %s，書目項目號碼
 
 #. %1$s: TMPL_VAR name=numberlength
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:71
-#, fuzzy, c-format
+#, c-format
 msgid "%s issues"
-msgstr "借出"
+msgstr "%s 期"
 
 #. %1$s: TMPL_VAR name=shelfbookcount
 #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:135
-#, fuzzy, c-format
+#, c-format
 msgid "%s item(s)"
-msgstr "%s (%s)"
+msgstr "%s 個書目"
 
 #. %1$s: TMPL_VAR name=monthlength
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:73
-#, fuzzy, c-format
+#, c-format
 msgid "%s months"
-msgstr "%s 報表"
+msgstr "%s 個月"
 
 #  NOTE 譯文更動 by Arthur
 #  NOTE 譯文更動 by Ambrose
@@ -541,7 +555,7 @@ msgstr "%s 個記錄沒有被匯入，因為要是不像機讀格式，就是沒
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:41
 #, c-format
 msgid "%s or thesaurus: %s or plugin: %s"
-msgstr ""
+msgstr "%s 或同義字典：%s 或模組：%s"
 
 #. %1$s: TMPL_VAR name=authorised_value
 #. %2$s: TMPL_VAR name=authtypes
@@ -563,11 +577,11 @@ msgstr "解析了 %s 個記錄"
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=repeatable
 #. %2$s: TMPL_VAR name=mandatory
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:23
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:21
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:23
 #, c-format
 msgid "%s repeatable %s mandatory"
-msgstr ""
+msgstr "%s 可重覆 %s 必備"
 
 #. %1$s: TMPL_VAR name=type
 #: ../../koha-tmpl/intranet-tmpl/default/en/reports.tmpl:3
@@ -595,18 +609,18 @@ msgstr "找到 %s 個結果。"
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl:32
 #, c-format
 msgid "%s suggestions waiting <a1>Manage</a>"
-msgstr ""
+msgstr "%s 個建議有待處理　<a1>處理</a>"
 
 #. %1$s: TMPL_VAR name=renewalsallowed
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl:143
-#, fuzzy, c-format
+#, c-format
 msgid "%s time(s)"
-msgstr "%s (%s)"
+msgstr "%s 次"
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=used
-#: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_210c.tmpl:70
 #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist-auth.tmpl:77
+#: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_210c.tmpl:70
 #, c-format
 msgid "%s times"
 msgstr "%s 次"
@@ -703,7 +717,6 @@ msgstr "&lt;&lt;&lt;"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/result.tmpl:9
 #: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/result.tmpl:64
-#, fuzzy
 msgid "&lt;&lt;Previous"
 msgstr "&lt;&lt; 上一頁"
 
@@ -713,41 +726,41 @@ msgstr "&lt;&lt; 上一頁"
 msgid "&nbsp No results found."
 msgstr "　找不到您需用的資料。"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:144
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:147
 msgid "&nbsp;&nbsp;&nbsp;&nbsp;Issue number&nbsp;&nbsp;&nbsp;&nbsp;"
-msgstr ""
+msgstr "　　期數　　"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:145
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:148
 msgid "&nbsp;&nbsp;&nbsp;&nbsp;Planned date&nbsp;&nbsp;&nbsp;&nbsp;"
 msgstr ""
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:146
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:149
 msgid "&nbsp;&nbsp;&nbsp;&nbsp;Status&nbsp;&nbsp;&nbsp;&nbsp;"
-msgstr ""
+msgstr "　　狀態　　"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:93
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:96
 msgid "&nbsp;&nbsp;&nbsp;&nbsp;X&nbsp;&nbsp;&nbsp;&nbsp;"
-msgstr ""
+msgstr "　　X　　"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:94
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:97
 msgid "&nbsp;&nbsp;&nbsp;&nbsp;Y&nbsp;&nbsp;&nbsp;&nbsp;"
-msgstr ""
+msgstr "　　Y　　"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:95
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:98
 msgid "&nbsp;&nbsp;&nbsp;&nbsp;Z&nbsp;&nbsp;&nbsp;&nbsp;"
-msgstr ""
+msgstr "　　Z　　"
 
 #  NOTE 譯文更動 by Arthur
-#: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_210c.tmpl:56
-#: ../../koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist-auth.tmpl:55
 #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist.tmpl:30
-#, fuzzy
+#: ../../koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist-auth.tmpl:55
+#: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_210c.tmpl:56
 msgid "&nbsp;No results found."
 msgstr "　找不到您需用的資料。"
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=note
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/suggestion-select.tmpl:41
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/bull-home.tmpl:26
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/searchresults.tmpl:63
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/searchresults.tmpl:64
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/searchresults.tmpl:65
@@ -777,6 +790,7 @@ msgid ""
 "table. Many academic libraries publish their stopwords list on the Internet, "
 "or you can ask other Koha libraries if they would share their stopword list.)"
 msgstr ""
+"（提示：如果您熟悉 MySQL，較快的做法可能會是先找一個既有的忽略字清單，作出所需之修改，將其轉為 MySQL 要求的格式，再使用 MySQL 的「Load Data Infile」指令匯入至忽略字表。很多學術性圖書館都把它們的忽略字清單上網，您也可以向其他使用 Koha 的圖書館詢問可否給您分享它們的忽略字清單。"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/printers.tmpl:4
 msgid ""
@@ -788,7 +802,6 @@ msgid ""
 msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/issuingrules.tmpl:17
-#, fuzzy
 msgid ""
 "(Note : fines are calculated by the fines2.pl script, located in misc "
 "directory. Ask your system administrator to put this script in crontab, "
@@ -805,7 +818,7 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl:77
 #, c-format
 msgid "(defined from suggestion #%s)"
-msgstr ""
+msgstr "(定義由第 %s 號新書建議取得)"
 
 #. %1$s: TMPL_VAR name=authtypecode
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:83
@@ -819,12 +832,12 @@ msgstr "(如適用)"
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=innerloop1
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:118
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:120
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:122
-#, fuzzy, c-format
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:121
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:123
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:125
+#, c-format
 msgid "(is %s)"
-msgstr "(%s, %s)"
+msgstr "(為 %s)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/export/marc.tmpl:13
 msgid "(leave blank to export every biblio)"
@@ -843,9 +856,10 @@ msgstr "(沒有輸入)"
 msgid "(subscription for"
 msgstr "說明"
 
+# XXX
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl:91
 msgid "(that all costs are for 1 item)"
-msgstr ""
+msgstr "（所有價錢應為單位成本）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl:81
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl:112
@@ -874,26 +888,27 @@ msgstr ""
 #. %1$s: TMPL_VAR name=pages
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:23
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:24
-#, fuzzy, c-format
+#, c-format
 msgid ", %s"
-msgstr "%s, %s"
+msgstr ", %s"
 
 #. %1$s: TMPL_VAR name=overduecount
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:45
-#, fuzzy, c-format
+#, c-format
 msgid ", %s Overdue"
-msgstr "過期"
+msgstr "、過期 %s 項"
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=publishercode
-#: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/result.tmpl:28
-#: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/result.tmpl:30
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/result.tmpl:42
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/result.tmpl:44
-#, fuzzy, c-format
+#: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/result.tmpl:28
+#: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/result.tmpl:30
+#, c-format
 msgid "- %s"
-msgstr "%s - %s"
+msgstr "- %s"
 
+#  FIXME 要找懂得寫這種信的人核對這個！！
 #. %1$s: TMPL_VAR name=lib.surname
 #. %2$s: TMPL_VAR
 #. %3$s: TMPL_VAR name=libemail
@@ -905,7 +920,10 @@ msgid ""
 "suggestion at this time. If you have any questions, please email us at %s. "
 "Thank you, %s"
 msgstr ""
+"。　閣下的新書建議，%s %s今日經已過目，決定暫不採納。如　閣下有任何問題，請電"
+"郵至 %s 聯絡我們。%s謹啟"
 
+#  FIXME 要找懂得寫這種信的人核對這個！！
 #. %1$s: TMPL_VAR name=lib.surname
 #. %2$s: TMPL_VAR
 #. %3$s: TMPL_VAR name=libemail
@@ -918,14 +936,19 @@ msgid ""
 "order is completed, and again when the book arrives at the library. If you "
 "have any questions, please email us at %s. Thank you, %s"
 msgstr ""
+"。　閣下的新書建議，%s %s今日經已過目，覺得很有建地。本館將儘快訂購　閣下建議"
+"的圖書資料。落訂後及收到圖書資料後將以電郵通知　閣下。如　閣下有任何問題，請"
+"電郵至 %s 聯絡我們。%s謹啟"
 
+# FIXME bug in tokenizer
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:22
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:23
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-detail.tmpl:22
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-detail.tmpl:23
 msgid ". Begins with"
-msgstr ""
+msgstr "。開始數值為"
 
+#  FIXME 要找懂得寫這種信的人核對這個！！
 #. %1$s: TMPL_VAR name=libemail
 #. %2$s: TMPL_VAR name=LibraryName
 #: ../../koha-tmpl/intranet-tmpl/default/en/suggestion/mail_suggestion_ORDERED.tmpl:3
@@ -935,8 +958,9 @@ msgid ""
 "arrive soon, at which time it will be processed for addition to the "
 "collection. You will be notified again when the book is available. If you "
 "have any questions, please email us at %s Thank you, %s"
-msgstr ""
+msgstr "。本館已訂購　閣下所建議之圖書資料，本館望於不日收到該項資料。當辦妥一切手續後，該項資料將成為本館館藏之一部分，介時本館將以電郵方式通知　閣下。如有疑問，請　閣下電郵至 %s 向本館查詢。%s 謹啟"
 
+#  FIXME 要找懂得寫這種信的人核對這個！！
 #. %1$s: TMPL_VAR name=libemail
 #. %2$s: TMPL_VAR name=LibraryName
 #: ../../koha-tmpl/intranet-tmpl/default/en/suggestion/mail_suggestion_AVAILABLE.tmpl:3
@@ -946,6 +970,7 @@ msgid ""
 "of the Nelsonville Public Library. If you have any questions, please email "
 "us at %s. Thank you, %s"
 msgstr ""
+"。　閣下所建議之圖書資料已成為本館館藏之一部分。如　閣下有任何疑問，請電郵 %s 向本館查詢。%s 謹啟"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/issuingrules.tmpl:49
 msgid "/"
@@ -954,96 +979,96 @@ msgstr "/"
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:129
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:131
 msgid "1 7/8 pouces/sec"
-msgstr ""
+msgstr "1 7/8 吋/秒"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:343
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:345
 msgid "1 pouce"
-msgstr ""
+msgstr "1 吋"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:114
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:116
 msgid "1.4 m/sec(disque compact)"
-msgstr ""
+msgstr "1.4 公呎/秒（雷射唱片 compact disk）"
 
 # FIXME looks like a BUG in the English template
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:38
-#, fuzzy
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:41
 msgid "1/2 Monthes"
-msgstr "個月%0.0s"
+msgstr "半個月"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:59
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:61
 msgid "1/2 months"
-msgstr ""
+msgstr "半個月"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:338
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:340
 msgid "1/2 pouce"
-msgstr ""
+msgstr "1/2 吋"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:74
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:76
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:47
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:50
 msgid "1/2 quarters"
-msgstr ""
+msgstr "半季"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:44
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:46
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:29
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:32
 msgid "1/2 weeks"
-msgstr ""
+msgstr "半週"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:84
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:86
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:53
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:56
 msgid "1/2 years"
-msgstr ""
+msgstr "半年"
 
 # FIXME looks like a BUG in the English template
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:41
-#, fuzzy
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:44
 msgid "1/3 Monthes"
-msgstr "個月%0.0s"
+msgstr "1/3 個月"
 
+#  NOTE http://datas.ncl.edu.tw/catweb/sect-2.htm 寫「8 厘米」；但這是不可能的。
+#  NOTE「8 mm」是「8 米厘」(「milli」，即 millimetre)，不是「8 厘米」(cm)。
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:358
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:360
 msgid "1/3 de pouce (8 mm)"
-msgstr ""
+msgstr "1/3 吋（8 米厘）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:64
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:66
 msgid "1/3 months"
-msgstr ""
+msgstr "1/3 個月"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:49
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:51
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:32
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:35
 msgid "1/3 weeks"
-msgstr ""
+msgstr "1/3 週"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:333
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:335
 msgid "1/4 de pouce"
-msgstr ""
+msgstr "1/4 吋"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:102
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:104
 msgid "1/8"
-msgstr ""
+msgstr "1/8 雲量"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:348
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:350
 msgid "1/8 eme de pouce"
-msgstr ""
+msgstr "1/8 吋（卡式錄音帶）"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:35
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:38
 msgid "1/Month"
 msgstr "每月一期"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:34
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:36
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:23
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:26
 msgid "1/day"
 msgstr "每日一期"
 
@@ -1054,193 +1079,190 @@ msgstr "每月一期"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:69
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:71
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:44
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:47
 msgid "1/quarter"
 msgstr "每季一期"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:39
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:41
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:26
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:29
 msgid "1/week"
 msgstr "每週一期"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:79
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:81
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:50
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:53
 msgid "1/year"
 msgstr "每週一期"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:292
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:294
 msgid "10 cm x 6.3 cm ou 3 pouces 7/8 x 2 pouces 1/2"
-msgstr ""
+msgstr "3 7/8 × 2 1/2 吋（卡式錄音帶）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:125
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:127
 msgid "105 mm (microfilm)"
-msgstr ""
+msgstr "105 米厘（微縮捲片）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:1296
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:1298
 msgid "1125 lignes"
 msgstr ""
 
+#  NOTE http://datas.ncl.edu.tw/catweb/sect-2.htm 寫「4 吋（雷射唱片）」，
+#  NOTE 但雷射唱片的直徑為 4 3/4 吋而非 4 吋
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:287
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:289
 msgid "12 cm ou 4 pouces 3/4"
-msgstr ""
+msgstr "4 3/4 吋（雷射唱片）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:409
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:411
 msgid "12 pistes"
-msgstr ""
+msgstr "十二音軌（十二分跡）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:257
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:259
 msgid "12.7 cm ou 5 pouces"
-msgstr ""
+msgstr "5 吋"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:119
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:121
 msgid "120 tpm"
-msgstr ""
+msgstr "1 吋/秒（120 轉/分）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:297
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:299
 msgid "13.2 cm x 9.7 cm ou 5 pouces 1/4 x 3 pouces 7/8"
-msgstr ""
+msgstr "5 1/4 × 3 7/8 吋（匣式錄音帶）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:149
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:151
 msgid "15 pouces/sec"
-msgstr ""
+msgstr "15 吋/秒（專業盤式錄音帶）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:134
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:136
 msgid "15/16 pouces/sec"
-msgstr ""
+msgstr "15/16 吋/秒（迷你錄音帶）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:89
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:91
 msgid "16 2/3 tpm"
-msgstr ""
+msgstr "16 2/3 吋/分"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:110
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:112
 msgid "16 mm (microfilm)"
-msgstr ""
+msgstr "16 米厘（微縮捲片）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:414
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:416
 msgid "16 pistes"
-msgstr ""
+msgstr "十六音軌（十六分跡）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:124
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:126
 msgid "160 tpm"
-msgstr ""
+msgstr "160 轉/分"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:262
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:264
 msgid "17.78 cm ou 7 pouces"
-msgstr ""
+msgstr "7 吋"
 
 # FIXME looks like a BUG in the English template
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:27
-#, fuzzy
 msgid "2 monthes"
-msgstr "個月%0.0s"
+msgstr "2 個月"
 
+#  TODO CMARC 寫 f6e 為「1 吋」，但「1 吋」為 f6c，CMARC 文件有錯
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:353
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:355
-#, fuzzy
 msgid "2 pouces"
-msgstr "-> 資源"
+msgstr "2 吋"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:36
-#, fuzzy
 msgid "2 quarters"
-msgstr "設定"
+msgstr "2 å­£"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:18
 msgid "2 weeks"
-msgstr ""
+msgstr "2 個月"
 
-# FIXME Bug in English template
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:42
-#, fuzzy
 msgid "2 years"
-msgstr "å¹´%0.0s"
+msgstr "2 å¹´"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:107
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:109
 msgid "2/8"
-msgstr ""
+msgstr "2/8 雲量"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:419
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:421
 msgid "24 pistes"
-msgstr ""
+msgstr "二十四軌"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:267
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:269
 msgid "25.4 cm ou 10 pouces"
-msgstr ""
+msgstr "10 吋"
 
 #. META http-equiv=refresh
 #: ../../koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl:4
 msgid "2; url=<!-- TMPL_VAR NAME=\"refresh\" -->"
-msgstr ""
+msgstr "2; url=<!-- TMPL_VAR NAME=\"refresh\" -->"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:139
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:141
 msgid "3 3/4 pouces/sec"
-msgstr ""
+msgstr "3 3/4 吋/秒（匣式錄音帶）"
 
 # FIXME looks like a BUG in the English template
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:30
-#, fuzzy
 msgid "3 Monthes"
-msgstr "個月%0.0s"
+msgstr "3 個月"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:21
 msgid "3 weeks"
-msgstr ""
+msgstr "3 週"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:130
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:132
 msgid "3 x 5 pouces"
-msgstr ""
+msgstr "3 × 5 吋（8 × 13 公分）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:112
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:114
 msgid "3/8"
-msgstr ""
+msgstr "3/8 雲量"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:154
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:156
 msgid "30 pouces/sec"
-msgstr ""
+msgstr "30 吋/秒"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:272
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:274
 msgid "30,48 cm ou 12 pouces"
-msgstr ""
+msgstr "12 吋"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:94
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:96
 msgid "33 1/3 tpm"
-msgstr ""
+msgstr "33 1/3 轉/分"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:115
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:117
 msgid "35 mm (microfilm)"
-msgstr ""
+msgstr "35 米厘（微縮捲片）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:282
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:284
 msgid "35.56 cm ou 14 pouces"
-msgstr ""
+msgstr "14 吋"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:617
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:619
@@ -1250,22 +1272,22 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:135
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:137
 msgid "4 x 6 pouces"
-msgstr ""
+msgstr "4 × 6 吋（11 × 15 公分）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:164
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:166
 msgid "4/10 pouces/sec"
-msgstr ""
+msgstr "4/10 吋/秒"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:117
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:119
 msgid "4/8"
-msgstr ""
+msgstr "4/8 雲量"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:277
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:279
 msgid "40.64 cm ou 16 pouces"
-msgstr ""
+msgstr "16 吋"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:1270
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:1272
@@ -1275,32 +1297,32 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:99
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:101
 msgid "45 tpm"
-msgstr ""
+msgstr "45 轉/分"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:302
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:304
 msgid "5.7 cm x 10 cm ou 2 pouces 1/4 x 4 pouces, cylindre"
-msgstr ""
+msgstr "2 1/4 × 4 吋（圓形錄音筒）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:122
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:124
 msgid "5/8"
-msgstr ""
+msgstr "5/8 雲量"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:424
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:426
 msgid "6 pistes"
-msgstr ""
+msgstr "六音軌"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:140
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:142
 msgid "6 x 9 pouces"
-msgstr ""
+msgstr "6 × 9 吋（16 × 23 公分）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:127
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:129
 msgid "6/8"
-msgstr ""
+msgstr "6/8 雲量"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:1283
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:1285
@@ -1315,67 +1337,68 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:144
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:146
 msgid "7 1/2 pouces/sec"
-msgstr ""
+msgstr "7 1/2 吋/秒（普通盤式錄音帶）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:252
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:254
 msgid "7.62cm ou 3 pouces"
-msgstr ""
+msgstr "3 吋"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:132
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:134
 msgid "7/8"
-msgstr ""
+msgstr "7/8 雲量"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:120
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:122
 msgid "70 mm (microfilm)"
-msgstr ""
+msgstr "70 米厘（微縮捲片）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:104
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:106
 msgid "78 tpm"
-msgstr ""
+msgstr "78 轉/分"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:105
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:107
 msgid "8 mm (microfilm)"
-msgstr ""
+msgstr "8 米厘（微縮捲片）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:404
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:406
 msgid "8 pistes"
-msgstr ""
+msgstr "八音軌（八分跡）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:109
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:111
 msgid "8 tpm"
-msgstr ""
+msgstr "8 轉/分"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:159
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:161
 msgid "8/10 pouces/sec"
-msgstr ""
+msgstr "8/10 吋/秒"
 
+#  NOTE CMARC 亂寫 :-(
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:145
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:147
 msgid "9 x 19 cm"
-msgstr ""
+msgstr "3 1/4 × 7 3/8 吋（9 × 19 公分）（孔卡）"
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=notes
-#: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/result.tmpl:31
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/result.tmpl:45
+#: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/result.tmpl:31
 #, c-format
 msgid ": %s"
 msgstr "：%s"
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=place
-#: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/result.tmpl:29
-#: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/result.tmpl:32
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/result.tmpl:43
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/result.tmpl:46
+#: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/result.tmpl:29
+#: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/result.tmpl:32
 #, c-format
 msgid "; %s"
 msgstr "; %s"
@@ -1416,6 +1439,8 @@ msgid ""
 "<a1> Edit biblio </a> <a2> Edit item </a> <a3> delete </a> <a4> Normal </a> "
 "<a5> ISBD </a> <a6> Add to shelf </a> <a7> Print </a>"
 msgstr ""
+"<a1> 修改書目 </a> <a2> 修改圖書資料 </a> <a3> 移除 </a> <a4> 一般 </a> "
+"<a5> ISBD </a> <a6> 新增至虛擬書架 </a> <a7> 列印 </a>"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/branchtransfers.tmpl:4
 #, c-format
@@ -1425,18 +1450,18 @@ msgstr "<a1>下個讀者</a>　<a2>還書</a>"
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/ISBDdetail.tmpl:5
 #, c-format
 msgid "<a1> Normal </a> <a2> MARC </a> <a3> Add to shelf </a> <a4> Print </a>"
-msgstr ""
+msgstr "<a1> 一般 </a> <a2> MARC </a> <a3> 新增至虛擬書架 </a> <a4> 列印 </a>"
 
 #. %1$s: TMPL_VAR name=count
 #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/detail.tmpl:11
-#, fuzzy, c-format
+#, c-format
 msgid "<a1> Print </a> <a2>%s biblios</a>"
-msgstr "<a1>查看帳戶</a> <a2>繳交罰款</a>"
+msgstr "<a1> 列印 </a> <a2>%s 個書目</a>"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:29
 #, fuzzy, c-format
 msgid "<a1> Subscription </a> <a2> Issues </a>"
-msgstr "<a1>還書</a>　<a2>移交</a>"
+msgstr "<a1>訂閱</a>　<a2>借出</a>"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:105
 #, c-format
@@ -1446,9 +1471,9 @@ msgstr "<a1>查看帳戶</a> <a2>繳交罰款</a>"
 #. %1$s: TMPL_VAR name=shelfname
 #. %2$s: TMPL_VAR name=shelfbookcount
 #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:73
-#, fuzzy, c-format
+#, c-format
 msgid "<a1>%s</a> (%s item(s))"
-msgstr "<a1>%s</a> %s (%s)"
+msgstr "<a1>%s</a> (%s 個書目)"
 
 # FIXME Looks like a SCANNER BUG
 #. %1$s: TMPL_VAR name=srvname
@@ -1459,23 +1484,24 @@ msgstr "<a1></a> \" %s"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/about-top.inc:35
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-top.inc:35
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/auth-top.inc:55
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/bull-top.inc:35
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc:39
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/circulation-top.inc:50
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/error-top.inc:44
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/marc-top.inc:45
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/members-top.inc:35
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/parameters-top.inc:36
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/reports-top.inc:35
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/auth-top.inc:55
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/bull-top.inc:35
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/error-top.inc:44
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/marc-top.inc:45
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<a1>Acquisitions</a> <a2>Catalogue</a> <a3>Circulation</a> <a4>Members</a> "
 "<a5>Authorities</a> <a6>Reports</a> <a7>Parameters</a> <a8>About</a> "
 "<a9>Help</a>"
 msgstr ""
-"<a1>主頁</a> <a2>目錄</a> <a3>讀者</a> <a4>採購</a> <a5>流通</a> <a6>報表</"
-"a> <a7>設定</a> <a8>關於</a>"
+"<a1>採購</a> <a2>目錄</a> <a3>流通</a> <a4>讀者</a> "
+"<a5>權威</a> <a6>報表</a> <a7>設定</a> <a8>關於</a> "
+"<a9>說明</a>"
 
 #  XXX 暫譯，譯文有待改進
 #: ../../koha-tmpl/intranet-tmpl/default/en/boraccount.tmpl:6
@@ -1483,21 +1509,22 @@ msgstr ""
 msgid "<a1>Create Manual Invoice</a> &nbsp; <a2>Create Manual Credit</a>"
 msgstr "<a1>人手建立發票</a>　　<a2>人手記入讀者貸方</a>"
 
+#  FIXME spelling mistake in original
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/bull-home.tmpl:32
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/lateissues.tmpl:41
 #, fuzzy, c-format
 msgid "<a1>Detail</a> <a2>Recieve</a>"
-msgstr "<a1>下個讀者</a>　<a2>還書</a>"
+msgstr "<a1>詳情</a>　<a2>收貨</a>"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:5
 #, c-format
 msgid "<a1>Edit</a> <a2>Issues</a> <a3>Biblio</a>"
-msgstr ""
+msgstr "<a1>修改</a> <a2>借出</a> <a3>書目</a>"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/parameters-top.inc:48
 #, c-format
 msgid "<a1>Funds</a> <a2>Auth value</a> <a3>Currencies</a> <a4>Printers</a>"
-msgstr ""
+msgstr "<a1>書籍採購資金</a> <a2>容許值</a> <a3>貨幣</a> <a4>印表機</a>"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes-top.inc:219
 #, c-format
@@ -1505,34 +1532,37 @@ msgid ""
 "<a1>Funds</a> <a2>Auth value</a> <a3>Thesaurus</a> <a4>Currencies</a> "
 "<a5>Printers</a>"
 msgstr ""
+"<a1>書籍採購資金</a> <a2>容許值</a> <a3>同義字典</a> <a4>貨幣</a> "
+"<a5>印表機</a>"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes-top.inc:206
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<a1>Home</a> <a2>Catalogue</a> <a3>Members</a> <a4>Acquisitions</a> "
 "<a5>Circulation</a> <a6>Authorities</a> <a7>Reports</a> <a8>Parameters</a> "
 "<a9>About</a> <a10>Help</a>"
 msgstr ""
-"<a1>主頁</a> <a2>目錄</a> <a3>讀者</a> <a4>採購</a> <a5>流通</a> <a6>報表</"
-"a> <a7>設定</a> <a8>關於</a>"
+"<a1>主頁</a> <a2>目錄</a> <a3>讀者</a> <a4>採購</a> "
+"<a5>流通</a> <a6>權威</a> <a7>報表</a> <a8>設定</a> "
+"<a9>有關</a> <a10>說明</a>"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/circulation-top.inc:62
-#, fuzzy, c-format
+#, c-format
 msgid "<a1>Issues</a> <a2>Returns</a> <a3>Branch transfers</a>"
-msgstr "<a1>借出</a>　<a2>移交</a>"
+msgstr "<a1>借出</a>　<a2>還書</a>　<a3>移交</a>"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/about-top.inc:49
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-top.inc:48
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc:59
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/circulation-top.inc:70
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/members-top.inc:54
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/parameters-top.inc:56
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/reports-top.inc:53
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/auth-search-top.inc:51
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/auth-top.inc:94
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/bull-top.inc:54
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc:59
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/circulation-top.inc:70
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/error-top.inc:64
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/marc-top.inc:66
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/members-top.inc:54
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/parameters-top.inc:56
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/reports-top.inc:53
 #: ../../koha-tmpl/intranet-tmpl/default/en/opac-main.tmpl:80
 #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes-top.inc:228
 #, c-format
@@ -1542,24 +1572,24 @@ msgstr "<a1>登入</a>Koha"
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:6
 #, c-format
 msgid "<a1>MARC</a> <a2>ISBD</a> <a3>Add to shelf</a> <a4>Print</a>"
-msgstr ""
+msgstr "<a1>MARC</a> <a2>ISBD</a> <a3>新增至虛擬書架</a> <a4>列印</a>"
 
 #. %1$s: TMPL_VAR name=surname
 #. %2$s: TMPL_VAR name=firstname
 #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:139
-#, fuzzy, c-format
+#, c-format
 msgid "<a1>Modify</a> %s%s"
-msgstr "<a1>%s</a> %s (%s)"
+msgstr "<a1>修改</a> %s%s"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/subject.tmpl:21
-#, fuzzy, c-format
+#, c-format
 msgid "<a1>Previous Records</a> <a2>Next Records</a>"
-msgstr "<a1>下個讀者</a>　<a2>還書</a>"
+msgstr "<a1>上一筆</a> <a2>下一筆</a>"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl:137
-#, fuzzy, c-format
+#, c-format
 msgid "<a1>Previous</a> <a2> Next</a>"
-msgstr "<a1>下個讀者</a>　<a2>還書</a>"
+msgstr "<a1>上一筆</a> <a2>下一筆</a>"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/pay.tmpl:41
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/readingrec.tmpl:51
@@ -1575,7 +1605,7 @@ msgstr "<a1>查看帳戶</a> <a2>繳交罰款</a>"
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/members-top.inc:47
 #, c-format
 msgid "<a1>Search</a> <a2>Add member</a> <a3>Add organisation</a>"
-msgstr ""
+msgstr "<a1>搜尋</a> <a2>新增讀者</a> <a3>新增機構</a"
 
 #  NOTE 譯文更動 by Arthur
 #  NOTE 譯文更動 by Ambrose
@@ -1597,33 +1627,32 @@ msgstr "<a1>對帳表：</a>每日報告 (今天)"
 msgid "<a1>Till Reconciliation:</a> Daily Report (yesterday)"
 msgstr "<a1>對帳表：</a>每日報告（昨天）"
 
-#  NOTE 譯文更動 by Arthur
+#  FIXME please fix the scanner :-(
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl:70
-#, fuzzy, c-format
+#, c-format
 msgid "<a1>View Basket</a> <h1 class=\"acquisition\">"
-msgstr "<a1>查看購物籃</a> <h1>%s - 訂單詳情</h1>"
+msgstr "<a1>查看購物籃</a> <h1 class=\"acquisition\">"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc:51
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/marc-top.inc:57
 #, c-format
 msgid ""
 "<a1>search</a> <a2>Add biblio</a> <a3>Serial</a> <a4>Virtual shelves</a>"
-msgstr ""
+msgstr "<a1>查詢</a> <a2>新增書目</a> <a3>期刊</a> <a4>虛擬書架</a>"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/error-top.inc:56
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<a1>search</a> <a2>Virtual shelves</a> <a3>Add biblio</a> <a4>Cat "
 "maintenance</a>"
 msgstr ""
-"<a1>快速查詢</a> <a2>機讀格式查詢</a> <a3>虛擬書架</a> <a4>新增書目</a> <a5>"
-"目錄維護</a>"
+"<a1>查詢</a> <a2>虛擬書架</a> <a3>新增書目</a> <a4>目錄維護</a>"
 
 #. %1$s: TMPL_VAR name=dateaccessioned
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl:61
-#, fuzzy, c-format
+#, c-format
 msgid "<b><a1> Accession Date:</a></b> %s"
-msgstr "<a1>登錄</a>日期：%s"
+msgstr "<b><a1>登錄日期：</a></b>%s"
 
 #  NOTE 譯文更動 by Arthur
 #. %1$s: TMPL_VAR name=issues
@@ -1679,25 +1708,25 @@ msgstr "<b>館別：</b>%s"
 #. %1$s: TMPL_VAR name=genbrname
 #. %2$s: TMPL_VAR name=genprname
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/branchtransfers.tmpl:11
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Branch:</b> %s &nbsp; <b>Printer:</b> %s <a1>Change Settings</a>"
-msgstr "<i>館別：</i>%s <i>印表機：</i>%s <a1>修改設定</a>"
+msgstr "<b>館別：</b>%s <b>印表機：</b>%s <a1>修改設定</a>"
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=branchname
 #. %2$s: TMPL_VAR name=printername
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:13
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl:6
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Branch:</b> %s, <b>Printer:</b> %s <a1>Change Settings</a>"
-msgstr "<i>館別：</i>%s <i>印表機：</i>%s <a1>修改設定</a>"
+msgstr "<b>館別：</b>%s <i>印表機：</b>%s <a1>修改設定</a>"
 
 # FIXME BUG in English template
 #. %1$s: TMPL_VAR name=wthdrawn
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl:64
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Cancelled:</b> %s"
-msgstr "已註銷：%s"
+msgstr "<b>已註銷：</b>%s"
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=classification
@@ -1745,9 +1774,9 @@ msgstr "<b>目前館別：</b>%s"
 
 #. %1$s: TMPL_VAR name=date_due
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl:53
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Date Due:</b> %s"
-msgstr "<b>日期：</b>%s"
+msgstr "<b>應歸還日期：</b>%s"
 
 # XXX inconsistency?
 #. %1$s: TMPL_VAR name=lastdate
@@ -1775,9 +1804,26 @@ msgstr "<b>杜威分類號：</b><a1>%s</a>"
 msgid "<b>Dig</b>: see data depending on this one"
 msgstr "<b>鑽探</b>：參閱依存這項權威條目的相關條目"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:18
+msgid ""
+"<b>EMN (Ecole des Mines de Nantes)</b> (Suggestion, stats modules and "
+"improved ldap support)"
+msgstr ""
+"<b>EMN (Ecole des Mines de Nantes)</b>（新書建議、統計模組及改良後的 LDAP 支援）"
+
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:19
+msgid ""
+"<b>ENSMP (Ecole Nationale Supérieure des Mines de Paris)</b> (biblio "
+"frameworks, MARC authorities, OPAC basket, Serials support)"
+msgstr ""
+
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/branchtransfers.tmpl:114
 msgid "<b>Enter Item Barcode:</b> Item Barcode:"
-msgstr ""
+msgstr "<b>請輸入圖書資料之條碼：</b>圖書資料之條碼："
+
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:51
+msgid "<b>Esiee School</b> (Jérome Vizcaino, Michel Lerenard, Pierre Cauchois)"
+msgstr "<b>Esiee 學院</b> (Jérome Vizcaino、Michel Lerenard、Pierre Cauchois)"
 
 #. %1$s: TMPL_VAR name=biblioitemnumber
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl:68
@@ -1788,7 +1834,6 @@ msgstr "<b>群組號碼：</b>%s"
 #  NOTE 譯文更動 by Arthur
 #  NOTE 譯文更動 by Ambrose
 #: ../../koha-tmpl/intranet-tmpl/default/en/modbibitem.tmpl:101
-#, fuzzy
 msgid ""
 "<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 "
@@ -1812,9 +1857,11 @@ msgstr "<b>所屬分館：</b>%s"
 msgid "<b>Home Branch:</b> %s"
 msgstr "<b>所屬分館：</b>%s"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:45
-msgid "<b>Horowhenua Library Trust</b> : Rosalie Blake, Head of Libraries"
-msgstr "<b>赫羅范努瓦圖書館信託</b>：圖書館總長 Rosalie Blake"
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:16
+msgid ""
+"<b>Horowhenua Library Trust</b> and Rosalie Blake, Head of Libraries, (Koha "
+"1.0)"
+msgstr "<b>赫羅范努瓦圖書館信託</b>及其圖書館總長 Rosalie Blake (Koha 1.0)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:22
 msgid ""
@@ -1860,18 +1907,6 @@ msgstr "<b>圖書資料已遺失：</b>%s"
 msgid "<b>Item type:</b> %s"
 msgstr "<b>圖書資料類別：</b>%s"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:47
-msgid ""
-"<b>Katipo Communications</b> : Rachel Hamilton-Williams, General Manager "
-"(Webmistress), Chris Cormack, 1.2 release manager and Simon Blake, Amanda "
-"Atkins, Operations Manager, Olwen Williams, Finlay Thompson, Gynn Lomax, "
-"Richard Anderson, Jeremy Blake, Rebecca Holden, Olive T. Canine"
-msgstr ""
-"<b>Katipo Communications</b>：總經理 Rachel Hamilton-Williams（網站管理人）、"
-"Chris Cormack（第1.2版出版主任）、以及 Simon Blake、運作經理 Amanda Atkins、"
-"Olwen Williams、Finlay Thompson、Gynn Lomax、Richard Anderson、Jeremy Blake、"
-"Rebecca Holden、Olive T. Canine"
-
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:41
 msgid ""
 "<b>KohaAdminEmailAddress --</b> The email address that will receive requests "
@@ -1966,11 +2001,7 @@ msgstr "<b>頁數：</b>%s"
 msgid "<b>Paid for:</b> %s"
 msgstr "<b>賠償：</b>%s"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:35
-msgid "<b>Pat Eyler</b>, Kaitiaki"
-msgstr "守護者 <b>Pat Eyler</b>"
-
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:36
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:24
 msgid "<b>Paul Poulain</b>, 2.2 release manager (MARC developper)"
 msgstr "第2.2版出版主任 <b>Paul Poulain</b>（機讀格式開發者）"
 
@@ -2004,6 +2035,10 @@ msgstr "<b>出版者：</b>%s"
 msgid "<b>Publisher:</b> %s"
 msgstr "<b>出版者：</b>%s"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:23
+msgid "<b>Rachel Hamilton-Williams</b>, Kaitiaki"
+msgstr "總經理兼網站管理人 <b>Rachel Hamilton-Williams</b>"
+
 #  XXX 譯文有待改進
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl:102
 msgid "<b>Related</b>: see other forms of this authority entry"
@@ -2053,7 +2088,7 @@ msgstr "<b>集叢題名：</b>%s"
 msgid "<b>Size:</b> %s"
 msgstr "<b>大小：</b>%s"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:38
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:69
 msgid ""
 "<b>Steve Tonnesen</b> (early MARC work, Virtual Bookshelves concept, KohaCD)"
 msgstr "<b>Steve Tonnesen</b> (機讀格式早期開發、虛擬書架概念、KohaCD)"
@@ -2069,7 +2104,7 @@ msgstr "<b>主題：</b>%s"
 
 #. %1$s: TMPL_VAR name=subjects
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:35
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Subjects:</b> %s"
 msgstr "<b>主題：</b>%s"
 
@@ -2178,6 +2213,10 @@ msgid ""
 "are displayed, not how they are stored in the database."
 msgstr ""
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:49
+msgid "<b>doXulting</b> (Matthieu Branlat) OPAC basket"
+msgstr ""
+
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:17
 msgid ""
 "<b>gist --</b> \"gist\" is \"GST\" (Good and Sales Tax) rate. If your local "
@@ -2313,8 +2352,8 @@ msgstr ""
 
 #  NOTE There is no "admin table". It refers to the "Thesaurus" screen in "Admin" (設定)
 #  NOTE 譯文更動 by Arthur
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:57
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:52
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:57
 msgid ""
 "A \"value builder\": values builders are perl programs that help you select "
 "the value of the field. They are MARC-flavor dependant and sometimes fill "
@@ -2394,16 +2433,16 @@ msgstr "著者"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-bottom.inc:12
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/about-bottom.inc:12
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/auth-search-bottom.inc:13
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/auth-bottom.inc:13
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/circulation-bottom.inc:12
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/bull-bottom.inc:12
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/cat-bottom.inc:12
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/parameters-bottom.inc:12
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/error-bottom.inc:12
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/issues-bottom.inc:12
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/members-bottom.inc:12
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/reports-bottom.inc:12
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/auth-bottom.inc:13
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/auth-search-bottom.inc:13
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/bull-bottom.inc:12
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/error-bottom.inc:12
 #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes-bottom.inc:12
 msgid "About"
 msgstr "關於"
@@ -2420,17 +2459,16 @@ msgstr "摘要："
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/suggestion/acceptorreject.tmpl:20
 msgid "Accept"
-msgstr ""
+msgstr "接納"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:77
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:79
-#, fuzzy
 msgid "Acceptable"
-msgstr "可重覆"
+msgstr "可"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/suggestion-select.tmpl:8
 msgid "Accepted by"
-msgstr ""
+msgstr "接納者"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/maninvoice.tmpl:12
 msgid "Account Management Fee"
@@ -2443,18 +2481,16 @@ msgstr "帳戶維護費"
 msgid "Account for <a1>%s %s</a>"
 msgstr "<a1>%s %s</a> 之賬戶"
 
-#  NOTE Stephen Hedges 答：「Accounts」係指財務報表 (Till Reconciliation)
-#  NOTE 所以整個字串只需譯「報表」即可
+#  NOTE 譯文更動 by Arthur
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl:48
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl:140
-#, fuzzy
 msgid "Accounting details"
-msgstr "報表"
+msgstr "會計詳情"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:134
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:136
 msgid "Acetate"
-msgstr ""
+msgstr "醋酸鹽 (Acetate)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:971
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:973
@@ -2464,22 +2500,23 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl:4
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-bottom.inc:8
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/about-bottom.inc:8
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/auth-search-bottom.inc:8
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/auth-bottom.inc:8
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/circulation-bottom.inc:8
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/bull-bottom.inc:8
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/cat-bottom.inc:8
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/parameters-bottom.inc:8
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/error-bottom.inc:8
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/issues-bottom.inc:8
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/members-bottom.inc:8
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/reports-bottom.inc:8
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/auth-bottom.inc:8
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/auth-search-bottom.inc:8
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/bull-bottom.inc:8
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/error-bottom.inc:8
 #: ../../koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl:115
 #: ../../koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl:137
 #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes-bottom.inc:8
 msgid "Acquisitions"
 msgstr "採購"
 
+#  FIXME 台灣真是這樣叫嗎？好恐怖呀，「膠彩」好得多了……
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:438
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:440
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:637
@@ -2487,7 +2524,7 @@ msgstr "採購"
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:837
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:839
 msgid "Acrylique"
-msgstr ""
+msgstr "壓克力顏料 (acrylics)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_125b.tmpl:98
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_125b.tmpl:100
@@ -2502,21 +2539,21 @@ msgstr "實際成本"
 msgid "Actual Cost *"
 msgstr "實際成本 *"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:58
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:39
 msgid "Adam Thick"
 msgstr "Adam Thick"
 
 #. IMG
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl:17
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl:23
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:151
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:101
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl:6
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl:31
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl:37
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl:146
 #: ../../koha-tmpl/intranet-tmpl/default/en/mancredit.tmpl:18
 #: ../../koha-tmpl/intranet-tmpl/default/en/maninvoice.tmpl:21
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:151
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:98
 msgid "Add"
 msgstr "新增"
 
@@ -2551,12 +2588,10 @@ msgid "Add Item"
 msgstr "新增圖書資料"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/members/memberentry.tmpl:10
-#, fuzzy
 msgid "Add Member, Institutional"
 msgstr "新增機構"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/members/memberentry.tmpl:3
-#, fuzzy
 msgid "Add Member, person"
 msgstr "新增讀者"
 
@@ -2593,13 +2628,13 @@ msgid "Add New Junior Member"
 msgstr "新增兒童讀者"
 
 #. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/default/en/shelves.tmpl:102
 #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:100
+#: ../../koha-tmpl/intranet-tmpl/default/en/shelves.tmpl:102
 msgid "Add New Shelf"
 msgstr "新增虛擬書架"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/shelves.tmpl:93
 #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:85
+#: ../../koha-tmpl/intranet-tmpl/default/en/shelves.tmpl:93
 msgid "Add Shelf"
 msgstr "新增虛擬書架"
 
@@ -2615,8 +2650,8 @@ msgid "Add System preference"
 msgstr "新增系統偏好"
 
 #. INPUT type=submit
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:165
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:160
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:164
 msgid "Add Tag"
 msgstr "新增欄"
 
@@ -2637,9 +2672,8 @@ msgid "Add a New Item for %s"
 msgstr "給 %s 新增圖書資料"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:38
-#, fuzzy
 msgid "Add a book by barcode"
-msgstr "在 %s 以條碼新增："
+msgstr "以條碼新增圖書資料"
 
 #. %1$s: TMPL_VAR name=shelfname
 #: ../../koha-tmpl/intranet-tmpl/default/en/shelves.tmpl:34
@@ -2686,17 +2720,16 @@ msgid "Add authorised value"
 msgstr "新增容許值"
 
 # NOTE http://dimes.lins.fju.edu.tw/pub/fju-lins-29/cmark3-dc.htm
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/auth-top.inc:87
+#. INPUT type=button
 #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/authorities.tmpl:15
-#, fuzzy
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/auth-top.inc:87
 msgid "Add authority"
-msgstr "權威"
+msgstr "新增權威"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:62
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:149
-#, fuzzy
 msgid "Add authority type"
-msgstr "新增圖書資料類別"
+msgstr "新增權威類別"
 
 #. INPUT type=button
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl:14
@@ -2713,10 +2746,10 @@ msgstr "新增書籍採購資金"
 msgid "Add budget"
 msgstr "新增預算"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:66
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:285
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:65
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:286
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:66
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:289
 msgid "Add category"
 msgstr "新增類別"
 
@@ -2769,8 +2802,8 @@ msgstr "新增機構"
 msgid "Add new category"
 msgstr "新增類別"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/shelves.tmpl:133
 #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:148
+#: ../../koha-tmpl/intranet-tmpl/default/en/shelves.tmpl:133
 msgid "Add or Remove Book Shelves"
 msgstr "新增或移除虛擬書架"
 
@@ -2795,8 +2828,8 @@ msgstr "新增印表機"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/bull-home.tmpl:38
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:206
-#: ../../koha-tmpl/intranet-tmpl/default/en/help/bull-home.tmpl:5
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/bull-home.tmpl:4
+#: ../../koha-tmpl/intranet-tmpl/default/en/help/bull-home.tmpl:5
 #, fuzzy
 msgid "Add subscription"
 msgstr "說明"
@@ -2806,8 +2839,8 @@ msgstr "說明"
 msgid "Add supplier"
 msgstr "新增供應商"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:62
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:62
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:62
 msgid "Add tag"
 msgstr "新增欄"
 
@@ -2828,9 +2861,8 @@ msgstr "新增至已有群組："
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/addbookbybiblionumber.tmpl:8
 #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/addbookbybiblionumber.tmpl:17
-#, fuzzy
 msgid "Add to virtual shelf"
-msgstr "虛擬書架"
+msgstr "新增至虛擬書架"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/stopwords.tmpl:59
 msgid "Add word"
@@ -2857,6 +2889,7 @@ msgid "Additional authors"
 msgstr "其他著者"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/member.tmpl:21
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/member-quicksearch-results.tmpl:13
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:43
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:107
 msgid "Address"
@@ -2864,9 +2897,8 @@ msgstr "地址"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:1499
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:1501
-#, fuzzy
 msgid "Adhesif"
-msgstr "新增虛擬書架"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl:92
 #: ../../koha-tmpl/intranet-tmpl/default/en/opac-main.tmpl:72
@@ -2878,7 +2910,7 @@ msgstr "進階查詢（更多選項）"
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_124d.tmpl:23
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_124d.tmpl:25
 msgid "Aerienne"
-msgstr ""
+msgstr "航空"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_110.tmpl:344
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_110.tmpl:346
@@ -2898,12 +2930,12 @@ msgstr ""
 msgid "Affiche"
 msgstr ""
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:108
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:186
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:257
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:111
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:183
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:256
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:108
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:186
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:257
 msgid "Age Required"
 msgstr "必須填寫年齡"
 
@@ -2922,7 +2954,7 @@ msgstr ""
 msgid "Ajouter"
 msgstr "新增"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:60
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:41
 msgid "Al Banks"
 msgstr "Al Banks"
 
@@ -2943,9 +2975,8 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1382
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1384
-#, fuzzy
 msgid "Allegorie"
-msgstr "類別"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/user/userpage.tmpl:58
 msgid "Allow library staff to see my reading record"
@@ -2957,7 +2988,7 @@ msgstr "批准"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:556
 msgid "Alphabet du titre"
-msgstr ""
+msgstr "題名語文"
 
 #  FIXME Scanner bug
 #  NOTE 下文為「Contact」，上下文為「Alternative Contact」，暫譯「緊急聯絡人」
@@ -2966,7 +2997,6 @@ msgid "Alternative"
 msgstr "緊急"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl:53
-#, fuzzy
 msgid "Alternative phone"
 msgstr "其他電話"
 
@@ -2978,7 +3008,7 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:9
 msgid "Altitude du capteur:"
-msgstr ""
+msgstr "感測器高度："
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128b.tmpl:178
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128b.tmpl:180
@@ -3001,9 +3031,9 @@ msgstr "著者"
 msgid "Aluminographie"
 msgstr ""
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:61
-msgid "Ambrose Li"
-msgstr "黎爵榮"
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:42
+msgid "Ambrose Li (chinese & translation tool)"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:76
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:78
@@ -3025,13 +3055,23 @@ msgstr ""
 
 #  NOTE There is no "admin table". It refers to the "Thesaurus" screen in "Admin" (設定)
 #  NOTE 譯文更動 by Arthur
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:55
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:51
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:55
 msgid ""
 "An \"authorised value\": it refers to a list of authorised values for this "
 "subfield. See the corresponding admin table."
 msgstr "「容許值」：指容許在這個分欄輸入的各種數值，見「設定」的「容許值」。"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/400.tmpl:4
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/401.tmpl:4
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/402.tmpl:4
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/403.tmpl:4
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/404.tmpl:4
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/405.tmpl:4
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/500.tmpl:4
+msgid "An Error has Occurred!"
+msgstr ""
+
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_124c.tmpl:18
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_124c.tmpl:20
 msgid "Anaglyphique"
@@ -3047,11 +3087,11 @@ msgstr ""
 msgid "Anamorphose (ecran panoramique)"
 msgstr ""
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:62
-msgid "Andrew Arensburger"
-msgstr "Andrew Arensburger"
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:43
+msgid "Andrew Arensburger (the small & great C4::Context module)"
+msgstr ""
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:59
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:40
 msgid "Andrew Hooper"
 msgstr "Andrew Hooper"
 
@@ -3118,17 +3158,16 @@ msgid ""
 msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl:19
-#, fuzzy
 msgid "Any word"
-msgstr "新增字詞"
+msgstr "任何字詞"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:25
-msgid "Apache version:"
-msgstr "Apache版本："
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:12
+msgid "Apache version"
+msgstr "Apache 版本"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:111
 msgid "Apr"
-msgstr ""
+msgstr "四月"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:354
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:356
@@ -3137,7 +3176,7 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:753
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:755
 msgid "Aquarelle"
-msgstr ""
+msgstr "水彩顏料 (water colour)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:978
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:980
@@ -3152,9 +3191,8 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:602
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:604
-#, fuzzy
 msgid "Arabe"
-msgstr "地區"
+msgstr "阿拉伯文"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/imemberentry.tmpl:51
 msgid "Area"
@@ -3203,7 +3241,7 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl:42
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl:44
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:161
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:164
 msgid "Arrived"
 msgstr ""
 
@@ -3226,7 +3264,7 @@ msgstr ""
 msgid "Arrives on"
 msgstr ""
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:56
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:59
 msgid "Arrives on:"
 msgstr ""
 
@@ -3247,12 +3285,11 @@ msgid "Article juridique"
 msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/issuingrules.tmpl:12
-#, fuzzy
 msgid ""
 "Ask your administrator to put this script in crontab, after midnight, to "
 "have fines calculated every night"
 msgstr ""
-"注意：罰款係由位於misc目錄內的fines2.pl計算。請要求您的系統管理員設定"
+"請要求您的系統管理員設定"
 "crontab，使這個程式在午夜後執行，以便罰款能在每晚重新計算。"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:798
@@ -3260,38 +3297,35 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:1073
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:1075
 msgid "Athenes (Grece)"
-msgstr ""
+msgstr "雅典（希臘）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:370
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:372
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_124b.tmpl:18
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_124b.tmpl:20
-#, fuzzy
 msgid "Atlas"
-msgstr "Al Banks"
+msgstr "地圖集（包括散葉之地圖集）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:115
 msgid "Aug"
-msgstr ""
+msgstr "八月"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:95
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:121
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:147
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:173
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:199
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:225
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:251
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:277
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:303
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:329
-#, fuzzy
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:99
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:129
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:159
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:189
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:219
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:249
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:279
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:309
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:339
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:369
 msgid "Auth"
-msgstr "著者"
+msgstr "權威"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:113
-#, fuzzy
 msgid "Auth type Admin"
-msgstr "圖書資料類別管理"
+msgstr "權威類別管理"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/marc_subfields_structure.tmpl:20
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/marctagstructure.tmpl:20
@@ -3302,17 +3336,16 @@ msgstr ""
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=authorised_value
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:136
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:111
-#, fuzzy, c-format
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:136
+#, c-format
 msgid "Auth value :%s,"
-msgstr "容許值"
+msgstr "容許值：%s、"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:44
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:41
-#, fuzzy
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:44
 msgid "Auth value:"
-msgstr "容許值"
+msgstr "容許值："
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl:18
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl:29
@@ -3320,12 +3353,16 @@ msgstr "容許值"
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/histsearch.tmpl:8
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/isbnsearch.tmpl:16
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/isbnsearch.tmpl:68
+#: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/addbookbybiblionumber.tmpl:7
+#: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:15
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/search.tmpl:31
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/cmsdsearchresults.tmpl:7
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/searchresults.tmpl:42
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/branchtransfers.tmpl:128
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:237
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:266
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl:186
+#: ../../koha-tmpl/intranet-tmpl/default/en/help/search.marc/search.tmpl:9
 #: ../../koha-tmpl/intranet-tmpl/default/en/maint/catmaintain.tmpl:35
 #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl:16
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/readingrec.tmpl:18
@@ -3336,10 +3373,6 @@ msgstr "容許值"
 #: ../../koha-tmpl/intranet-tmpl/default/en/default.tmpl:5
 #: ../../koha-tmpl/intranet-tmpl/default/en/modbib.tmpl:9
 #: ../../koha-tmpl/intranet-tmpl/default/en/overdue.tmpl:11
-#: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/addbookbybiblionumber.tmpl:7
-#: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:15
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/search.tmpl:31
-#: ../../koha-tmpl/intranet-tmpl/default/en/help/search.marc/search.tmpl:9
 msgid "Author"
 msgstr "著者"
 
@@ -3350,15 +3383,15 @@ msgid "Author:"
 msgstr "著者："
 
 #  NOTE 下文為「Value」，全文為「Authorised Value」(^^;)
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:144
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:138
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:143
 msgid "Authorised"
 msgstr "容許"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:73
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:15
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:56
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:73
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:73
 msgid "Authorised value"
 msgstr "容許值"
 
@@ -3371,16 +3404,14 @@ msgid "Authorised values admin"
 msgstr "容許值管理"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/authorised_values.tmpl:2
-#, fuzzy
 msgid "Authorised values management"
 msgstr "容許值管理"
 
 # NOTE http://dimes.lins.fju.edu.tw/pub/fju-lins-29/cmark3-dc.htm
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/auth-bottom.inc:10
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/auth-search-bottom.inc:10
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/auth-bottom.inc:10
 #: ../../koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl:123
 #: ../../koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl:145
-#, fuzzy
 msgid "Authorities"
 msgstr "權威"
 
@@ -3396,9 +3427,9 @@ msgstr "權威"
 # NOTE http://dimes.lins.fju.edu.tw/pub/fju-lins-29/cmark3-dc.htm
 #. %1$s: TMPL_VAR name=authtypecode
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:137
-#, fuzzy, c-format
+#, c-format
 msgid "Authority :%s,"
-msgstr "權威"
+msgstr "權威：%s、"
 
 #. %1$s: TMPL_VAR name=tagfield
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:83
@@ -3415,74 +3446,74 @@ msgstr "權威說明"
 msgid "Authority marc framework for"
 msgstr ""
 
-#  XXX 暫譯，要問人核對
+# XXX
 #. %1$s: TMPL_VAR name=authid
 #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/authorities.tmpl:6
-#, fuzzy, c-format
+#, c-format
 msgid "Authority number %s"
-msgstr "權威說明"
+msgstr "權威號碼：%s"
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=authid
-#: ../../koha-tmpl/intranet-tmpl/default/en/authorities/detail-biblio-search.tmpl:4
 #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/detail.tmpl:4
-#, fuzzy, c-format
+#: ../../koha-tmpl/intranet-tmpl/default/en/authorities/detail-biblio-search.tmpl:4
+#, c-format
 msgid "Authority number : %s"
-msgstr "借書證號碼：%s"
+msgstr "權威號碼：%s"
 
+# FIXME bug in tokenizer
 #. IMG
 #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist.tmpl:48
 msgid "Authority number <!-- TMPL_VAR NAME=\"authid\" -->"
-msgstr ""
+msgstr "權威號碼：<!-- TMPL_VAR NAME=\"authid\" -->"
 
+# FIXME bug in tokenizer
 #. IMG
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/receipt-search-result.tmpl:38
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/searchresultlist.tmpl:44
 msgid "Authority number <!-- TMPL_VAR name=\"authid\" -->"
-msgstr ""
+msgstr "權威號碼：<!-- TMPL_VAR name=\"authid\" -->"
 
+# FIXME bug in tokenizer
 #. IMG
 #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist.tmpl:48
 msgid "Authority number<!-- TMPL_VAR NAME=\"authid\" -->"
-msgstr ""
+msgstr "權威號碼：<!-- TMPL_VAR NAME=\"authid\" -->"
 
+# FIXME bug in tokenizer
 #. IMG
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/searchresultlist.tmpl:44
 msgid "Authority number<!-- TMPL_VAR name=\"authid\" -->"
-msgstr ""
+msgstr "權威號碼：<!-- TMPL_VAR name=\"authid\" -->"
 
-# NOTE http://dimes.lins.fju.edu.tw/pub/fju-lins-29/cmark3-dc.htm
-#: ../../koha-tmpl/intranet-tmpl/default/en/authorities/auth_finder.tmpl:4
 #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/authorities-home.tmpl:4
-#, fuzzy
+#: ../../koha-tmpl/intranet-tmpl/default/en/authorities/auth_finder.tmpl:4
 msgid "Authority search"
-msgstr "權威"
+msgstr "權威搜尋"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_210c.tmpl:3
-#: ../../koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist-auth.tmpl:3
 #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist.tmpl:3
+#: ../../koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist-auth.tmpl:3
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/searchresultlist.tmpl:3
-#, fuzzy
+#: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_210c.tmpl:3
 msgid "Authority search results"
-msgstr "機讀格式查詢結果"
+msgstr "權威搜尋結果"
 
 #. %1$s: TMPL_VAR name=authtypetext
 #. %2$s: TMPL_VAR name=authtypecode
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:92
-#, fuzzy, c-format
+#, c-format
 msgid "Authority structure definition for %s (%s)"
-msgstr "%s 之機讀格式分欄結構管理"
+msgstr "%s (%s) 之權威結構定義"
 
 # NOTE http://dimes.lins.fju.edu.tw/pub/fju-lins-29/cmark3-dc.htm
+#: ../../koha-tmpl/intranet-tmpl/default/en/authorities/authorities-home.tmpl:13
+#: ../../koha-tmpl/intranet-tmpl/default/en/authorities/auth_finder.tmpl:13
+#: ../../koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist-auth.tmpl:12
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:68
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:70
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_210c.tmpl:13
-#: ../../koha-tmpl/intranet-tmpl/default/en/authorities/auth_finder.tmpl:13
-#: ../../koha-tmpl/intranet-tmpl/default/en/authorities/authorities-home.tmpl:13
-#: ../../koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist-auth.tmpl:12
-#, fuzzy
 msgid "Authority type"
-msgstr "權威"
+msgstr "權威類別"
 
 #. SCRIPT
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:56
@@ -3492,9 +3523,8 @@ msgstr "沒有填寫類別編號"
 
 # NOTE http://dimes.lins.fju.edu.tw/pub/fju-lins-29/cmark3-dc.htm
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/authtypes.tmpl:2
-#, fuzzy
 msgid "Authority types"
-msgstr "權威"
+msgstr "權威類別"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_125b.tmpl:53
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_125b.tmpl:55
@@ -3659,9 +3689,8 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_141.tmpl:327
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_141.tmpl:369
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_141.tmpl:371
-#, fuzzy
 msgid "Autre"
-msgstr "著者"
+msgstr "其他"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128b.tmpl:218
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128b.tmpl:220
@@ -3716,6 +3745,7 @@ msgstr ""
 msgid "Autre forme de contenu"
 msgstr ""
 
+#  TODO
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:354
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:356
 msgid "Autre instance officielle"
@@ -3754,12 +3784,12 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:189
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:192
 msgid "Autre procede non-photographique"
-msgstr ""
+msgstr "其他非照相媒體"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:219
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:222
 msgid "Autre procede photographique"
-msgstr ""
+msgstr "其他照相類媒體"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:237
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:239
@@ -3795,9 +3825,8 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:527
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:183
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:185
-#, fuzzy
 msgid "Autres"
-msgstr "著者"
+msgstr "其他"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_124f.tmpl:103
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_124f.tmpl:105
@@ -3836,23 +3865,20 @@ msgstr ""
 msgid "Autres procedes en couleur"
 msgstr ""
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:500
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:502
+#: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:586
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:588
+#: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:672
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:674
+#: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:758
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:760
+#: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:844
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:846
+#: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:930
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:932
 msgid "Autres renseignements historiques"
-msgstr ""
-
-#: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:500
-#: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:586
-#: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:672
-#: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:758
-#: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:844
-#: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:930
-msgid "Autres renseignements hitoriques"
-msgstr ""
+msgstr "其他史料"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_125b.tmpl:118
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_125b.tmpl:120
@@ -3861,11 +3887,11 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:70
 msgid "Autres types de document graphique non projetable"
-msgstr ""
+msgstr "其他非投影性平面作品 (other non-projected graphic type)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:72
 msgid "Autres types de documents graphique non projetable"
-msgstr ""
+msgstr "其他非投影性平面作品 (other non-projected graphic type)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:478
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:480
@@ -3971,22 +3997,22 @@ msgstr "購物籃"
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:28
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:30
 msgid "Bande \"Master\""
-msgstr ""
+msgstr "母帶 (master tape)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:33
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:35
 msgid "Bande (en cartouche)"
-msgstr ""
+msgstr "匣式錄音帶"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:28
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:30
 msgid "Bande (en cassette)"
-msgstr ""
+msgstr "卡式錄音帶"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:23
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:25
 msgid "Bande (sur bobine)"
-msgstr ""
+msgstr "盤式錄音帶"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:195
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:197
@@ -4044,7 +4070,7 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:53
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:55
 msgid "Bande microfilm"
-msgstr ""
+msgstr "長條微縮片 (microfilm slip)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:198
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:200
@@ -4053,11 +4079,11 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:33
 msgid "Bande reproduite a partir du \"master\""
-msgstr ""
+msgstr "複製母帶 (tape duplication master)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:35
 msgid "Bande reproduite a partir du master"
-msgstr ""
+msgstr "複製母帶 (tape duplication master)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:189
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:191
@@ -4072,7 +4098,7 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:57
 msgid ""
 "Bandes spectrales (nombre a deux chiffres 01->99 ou xx (ecrire 01 pour 1):"
-msgstr ""
+msgstr "光譜段數（01–99，不適用者填xx）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:349
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:351
@@ -4124,31 +4150,28 @@ msgid "Barcode <b>%s</b> has already been assigned."
 msgstr "條碼 <b>%s</b> 已在使用中。"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/newjmember.tmpl:51
-#, fuzzy
 msgid "Barcode Number"
-msgstr "借書證號碼"
+msgstr "條碼"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/catalogue-home.tmpl:35
-#, fuzzy
 msgid "Barcode Search"
-msgstr "館藏查詢"
+msgstr "條碼搜尋"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:93
 msgid "Barcode generator"
-msgstr ""
+msgstr "條碼產生器"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/catalogue-home.tmpl:37
-#, fuzzy
 msgid "Barcode:"
-msgstr "條碼"
+msgstr "條碼："
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:44
 msgid "Barcodes Generator"
-msgstr ""
+msgstr "條碼產生器"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl:128
 msgid "Barcodes generator"
-msgstr ""
+msgstr "條碼產生器"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128b.tmpl:323
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128b.tmpl:325
@@ -4174,19 +4197,16 @@ msgid "Basket"
 msgstr "購物籃"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl:73
-#, fuzzy
 msgid "Basket empty"
-msgstr "購物籃"
+msgstr "書籃是空的"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl:7
-#, fuzzy
 msgid "Basket info"
-msgstr "購物籃"
+msgstr "書籃資訊"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl:8
-#, fuzzy
 msgid "Basket number"
-msgstr "借書證號碼"
+msgstr "書籃號碼"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128b.tmpl:328
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128b.tmpl:330
@@ -4249,16 +4269,16 @@ msgid "Beginnning date (*)"
 msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:29
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:20
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:23
 #, fuzzy
 msgid "Beginnning date:"
-msgstr "登記日期"
+msgstr "開始日期："
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:193
 msgid "Begins with"
 msgstr ""
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:63
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:44
 msgid "Benedykt P. Barszcz (Polish for 2.0)"
 msgstr "Benedykt P. Barszcz (2.0版之波蘭文譯者)"
 
@@ -4282,27 +4302,25 @@ msgstr "《Between Brothers》，Irene Morck著，位於總館"
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:18
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:20
 msgid "Bi-dimensionnel"
-msgstr ""
+msgstr "平面"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-bib-search.tmpl:4
-#, fuzzy
 msgid "Bib search"
-msgstr "快速查詢"
+msgstr "書目搜尋"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:5
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:19
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:15
-#, fuzzy
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:18
 msgid "Biblio"
-msgstr "書目記錄號碼"
+msgstr "書目記錄"
 
 #  NOTE 譯文更動 by Arthur
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/isbnsearch.tmpl:3
 msgid "Biblio Search Results"
 msgstr "書目搜尋結果"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/biblio_framework.tmpl:105
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/biblio_framework.tmpl:2
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/biblio_framework.tmpl:105
 #, fuzzy
 msgid "Biblio framework"
 msgstr "書目記錄號碼"
@@ -4342,9 +4360,8 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1096
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1248
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1250
-#, fuzzy
 msgid "Bibliographie"
-msgstr "-> 書目"
+msgstr "書目"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/default.tmpl:5
 msgid "Biblionumber"
@@ -4372,7 +4389,6 @@ msgstr ""
 msgid "Bimestriel"
 msgstr ""
 
-#  NOTE 譯文更動 by Arthur
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:1104
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_110.tmpl:352
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_110.tmpl:354
@@ -4380,11 +4396,9 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_125b.tmpl:60
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1447
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1449
-#, fuzzy
 msgid "Biographie"
-msgstr "-> 書目"
+msgstr ""
 
-# NOTE Cf http://dimes.lins.fju.edu.tw/pub/bulletin-lac-60/dc-cmark.htm
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:1136
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:1138
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1507
@@ -4406,7 +4420,7 @@ msgstr "完整專論"
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:940
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:942
 msgid "Biographie de l'arrangeur ou de l'auteur de la transcription"
-msgstr ""
+msgstr "編曲者介紹"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:480
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:482
@@ -4421,7 +4435,7 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:910
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:912
 msgid "Biographie de l'interprete ou historique de l'ensemble"
-msgstr ""
+msgstr "演出者介紹"
 
 # NOTE Cf http://dimes.lins.fju.edu.tw/pub/bulletin-lac-60/dc-cmark.htm
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:475
@@ -4436,9 +4450,8 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:821
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:905
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:907
-#, fuzzy
 msgid "Biographie du compositeur"
-msgstr "完整專論"
+msgstr "作曲者介紹"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:1129
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:1131
@@ -4505,16 +4518,15 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_141.tmpl:85
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_141.tmpl:138
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_141.tmpl:140
-#, fuzzy
 msgid "Bois"
-msgstr "波蘭文"
+msgstr "木材"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:818
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:820
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:1093
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:1095
 msgid "Bombay (Inde)"
-msgstr ""
+msgstr "孟買（印度）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_141.tmpl:256
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_141.tmpl:258
@@ -4529,12 +4541,10 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:522
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:82
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:84
-#, fuzzy
 msgid "Bonne"
-msgstr "無"
+msgstr "ä½³"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/aqbookfund.tmpl:3
-#, fuzzy
 msgid "Book Fund Administration"
 msgstr "書籍採購資金管理"
 
@@ -4572,9 +4582,8 @@ msgid "Book funds"
 msgstr "書籍採購資金"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/order.tmpl:8
-#, fuzzy
 msgid "Book seller"
-msgstr "虛擬書架"
+msgstr "圖書供應商"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl:50
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl:146
@@ -4586,8 +4595,8 @@ msgstr "書籍採購資金"
 msgid "Bookfund admin"
 msgstr "書籍採購資金管理"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/shelves.tmpl:55
 #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:54
+#: ../../koha-tmpl/intranet-tmpl/default/en/shelves.tmpl:55
 msgid "Bookshelves"
 msgstr "虛擬書架"
 
@@ -4596,7 +4605,6 @@ msgid "Borrower"
 msgstr "讀者"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/categorie.tmpl:2
-#, fuzzy
 msgid "Borrower Categories"
 msgstr "讀者類別"
 
@@ -4608,23 +4616,21 @@ msgstr "讀者資料"
 msgid "Borrower categories"
 msgstr "讀者類別"
 
-#  NOTE 字義由NPL的Owen提供
 #. %1$s: TMPL_VAR name=charges
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/deletemem.tmpl:10
-#, fuzzy, c-format
+#, c-format
 msgid "Borrower has %s debt"
-msgstr "讀者目前失去借書權利"
+msgstr "此讀者欠 %s"
 
 #. %1$s: TMPL_VAR name=ItemsOnIssues
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/deletemem.tmpl:7
 #, c-format
 msgid "Borrower has %s item(s) on issue"
-msgstr ""
+msgstr "此讀者借出了 %s 項圖書資料"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/deletemem.tmpl:13
-#, fuzzy
 msgid "Borrower has guarantees"
-msgstr "讀者類別"
+msgstr "此讀者有擔保"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:32
 msgid "Borrower information"
@@ -4720,7 +4726,7 @@ msgstr "分館：修改分館類別"
 msgid "Brevet"
 msgstr "收貨"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:64
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:45
 msgid "Brig C. McCoy"
 msgstr "Brig C. McCoy"
 
@@ -4745,8 +4751,8 @@ msgstr "瀏覽讀者"
 msgid "Bruxelles (Belgique)"
 msgstr ""
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:17
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:28
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:14
 msgid "Budget"
 msgstr "預算案"
 
@@ -4791,9 +4797,8 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:1205
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:1398
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:1400
-#, fuzzy
 msgid "Burin"
-msgstr "列印"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:1115
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:1117
@@ -4816,11 +4821,15 @@ msgstr "子女 %s"
 msgid "COMPANY DETAILS"
 msgstr "公司詳情"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:38
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:93
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:158
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl:163
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:222
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:71
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:38
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:98
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/biblio_framework.tmpl:90
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:211
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:222
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/currency.tmpl:126
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl:118
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:71
@@ -4828,18 +4837,14 @@ msgstr "公司詳情"
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/printers.tmpl:131
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl:123
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl:176
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:71
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:92
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:98
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/biblio_framework.tmpl:90
 msgid "CONFIRM DELETION"
 msgstr "確定要移除嗎"
 
 #. %1$s: TMPL_VAR name=searchfield
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/stopwords.tmpl:90
-#, fuzzy, c-format
+#, c-format
 msgid "CONFIRM DELETION of %s"
-msgstr "確定要移除嗎"
+msgstr "確定要移除 %s 嗎"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl:90
 msgid "CONFIRM DELETION of this entry"
@@ -4867,16 +4872,14 @@ msgid "Cadix (Espagne)"
 msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl:77
-#, fuzzy
 msgid "Call Number"
-msgstr "借書證號碼"
+msgstr "索書號"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:238
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:267
 #: ../../koha-tmpl/intranet-tmpl/default/en/reports/inventory.tmpl:37
-#, fuzzy
 msgid "Call number"
-msgstr "借書證號碼"
+msgstr "索書號"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:918
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:920
@@ -4887,8 +4890,8 @@ msgstr "借書證號碼"
 msgid "Camaieu"
 msgstr ""
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:66
-msgid "Can't find inventary codes on that range. Please try again."
+#: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:65
+msgid "Can't find inventory codes in that range. Please try again."
 msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:442
@@ -4905,16 +4908,15 @@ msgstr "取消"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:201
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:204
-#, fuzzy
 msgid "Cancel Reserve"
-msgstr "預約"
+msgstr "取消預約"
 
 #  NOTE 譯文更動 by Arthur
 #  NOTE 譯文更動 by Ambrose
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/branchtransfers.tmpl:30
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/branchtransfers.tmpl:48
 msgid "Cancel reservation and then attempt transfer:"
-msgstr "取消預約，然後嘗試移交"
+msgstr "取消預約，然後嘗試移交："
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/moditem.tmpl:28
 msgid "Cancelled"
@@ -4931,9 +4933,8 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:103
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:105
-#, fuzzy
 msgid "Cantates"
-msgstr "聯絡人：%s"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:113
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:115
@@ -4953,6 +4954,7 @@ msgid "Caractere braille et moon"
 msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/member.tmpl:17
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/member-quicksearch-results.tmpl:10
 msgid "Card"
 msgstr "借書證"
 
@@ -5000,19 +5002,17 @@ msgstr "費用"
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:18
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:20
 msgid "Carte a fenetre"
-msgstr ""
+msgstr "孔卡 (aperture card)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:1535
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:1537
-#, fuzzy
 msgid "Carte a jouer"
-msgstr "目錄"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:94
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:96
-#, fuzzy
 msgid "Carte bristol"
-msgstr "類別"
+msgstr "布里斯托紙板 (bristol board)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:1521
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:1523
@@ -5112,14 +5112,13 @@ msgstr "費用"
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_141.tmpl:100
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_141.tmpl:153
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_141.tmpl:155
-#, fuzzy
 msgid "Carton"
-msgstr "讀者"
+msgstr "紙板"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:99
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:101
 msgid "Carton / carte a dessin"
-msgstr ""
+msgstr "紙板"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:980
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:982
@@ -5132,9 +5131,8 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:621
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:819
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:821
-#, fuzzy
 msgid "Caseine"
-msgstr "取消"
+msgstr "乾酪膠 (casein)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/maninvoice.tmpl:15
 msgid "Cash Refund"
@@ -5146,16 +5144,16 @@ msgstr "Cataline 圖書館"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-bottom.inc:6
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/about-bottom.inc:6
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/auth-search-bottom.inc:6
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/auth-bottom.inc:6
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/circulation-bottom.inc:6
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/bull-bottom.inc:6
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/cat-bottom.inc:6
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/parameters-bottom.inc:6
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/error-bottom.inc:6
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/issues-bottom.inc:6
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/members-bottom.inc:6
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/reports-bottom.inc:6
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/auth-bottom.inc:6
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/auth-search-bottom.inc:6
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/bull-bottom.inc:6
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/error-bottom.inc:6
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:408
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:410
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:545
@@ -5193,9 +5191,9 @@ msgstr "目錄"
 msgid "Catalogue de bibliotheque"
 msgstr ""
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/search.tmpl:4
 #: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl:8
 #: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/suggest.tmpl:7
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/search.tmpl:4
 msgid "Catalogue search"
 msgstr "館藏查詢"
 
@@ -5223,15 +5221,15 @@ msgstr "類別"
 msgid "Categories fines de couleurs (films)"
 msgstr ""
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:88
+#: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:112
+#: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:161
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/member.tmpl:20
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:14
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:55
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:253
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:251
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:253
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl:46
-#: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:88
-#: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:112
-#: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:161
 msgid "Category"
 msgstr "類別"
 
@@ -5242,22 +5240,21 @@ msgid "Category %s"
 msgstr "類別 %s"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/categorie.tmpl:6
-#, fuzzy
 msgid "Category Code and Description"
-msgstr "類別管理"
+msgstr "類別代碼及描述"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:241
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:230
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:241
 msgid "Category admin"
 msgstr "類別管理"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:75
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:82
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:164
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:222
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:76
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:84
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:161
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:75
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:82
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:164
 msgid "Category code"
 msgstr "類別編號"
 
@@ -5308,7 +5305,7 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:305
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:308
 msgid "Ce n'est pas une reproduction"
-msgstr ""
+msgstr "非複製品"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:1013
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:1015
@@ -5328,7 +5325,7 @@ msgstr "重設"
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:234
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:236
 msgid "Centimetres"
-msgstr ""
+msgstr "公分（厘米）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:257
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:259
@@ -5392,9 +5389,8 @@ msgid "Chaque fascicule contient son propre index - volant"
 msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/import/breeding.tmpl:24
-#, fuzzy
 msgid "Character encoding"
-msgstr "編碼 (MARC21 或 UNIMARC)"
+msgstr "編碼"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/marcimport.tmpl:42
 msgid "Character encoding (MARC21 or UNIMARC)"
@@ -5406,9 +5402,8 @@ msgstr "編碼 (MARC21 或 UNIMARC)"
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:531
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:729
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:731
-#, fuzzy
 msgid "Charbon"
-msgstr "修改"
+msgstr "木炭 (coal)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:172
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl:134
@@ -5448,9 +5443,13 @@ msgstr "查詢"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:597
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:599
-#, fuzzy
 msgid "Chinois"
-msgstr "數量"
+msgstr "中文"
+
+#. INPUT type=button
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/member-quicksearch-results.tmpl:21
+msgid "Choose"
+msgstr "選擇"
 
 #  NOTE 譯文更動 by Arthur
 #. %1$s: TMPL_VAR name=tablename
@@ -5460,6 +5459,11 @@ msgstr "數量"
 msgid "Choose and validate 1 of the following for <b>%s.%s</b>"
 msgstr "為<b>%s.%s</b>選取及查核以下其中一項"
 
+#. INPUT type=button
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/member-quicksearch-results.tmpl:21
+msgid "Choose this Patron"
+msgstr ""
+
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:63
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:65
 msgid "Chorale-prelude"
@@ -5483,6 +5487,10 @@ msgstr ""
 msgid "Choroplethe"
 msgstr "主要組員"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:32
+msgid "Chris Cormack, 1.2 release manager"
+msgstr "Chris Cormack (1.2版出版主任)"
+
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:934
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:936
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:1129
@@ -5505,16 +5513,16 @@ msgstr "費用"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-bottom.inc:9
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/about-bottom.inc:9
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/auth-search-bottom.inc:9
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/auth-bottom.inc:9
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/circulation-bottom.inc:9
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/bull-bottom.inc:9
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/cat-bottom.inc:9
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/parameters-bottom.inc:9
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/error-bottom.inc:9
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/issues-bottom.inc:9
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/members-bottom.inc:9
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/reports-bottom.inc:9
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/auth-bottom.inc:9
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/auth-search-bottom.inc:9
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/bull-bottom.inc:9
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/error-bottom.inc:9
 #: ../../koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl:133
 #: ../../koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl:141
 #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes-bottom.inc:9
@@ -5599,15 +5607,13 @@ msgstr ""
 msgid "Clavicorde"
 msgstr ""
 
-#. INPUT type=reset
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/catalogue-home.tmpl:45
 #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist-auth.tmpl:71
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/catalogue-home.tmpl:45
 msgid "Clear"
 msgstr "重設"
 
 #. INPUT type=reset name=B2
-#: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:180
-#, fuzzy
+#: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:174
 msgid "Clear Fields"
 msgstr "全部重設"
 
@@ -5634,13 +5640,12 @@ msgid "Click submit to force the subject"
 msgstr "要強迫修改主題，按「遞交」即可"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl:16
-#, fuzzy
 msgid "Close"
-msgstr "編碼"
+msgstr "關閉"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/help-bottom.inc:1
 msgid "Close online help"
-msgstr ""
+msgstr "關閉線上說明"
 
 #. %1$s: TMPL_VAR name=closedate
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl:14
@@ -5652,13 +5657,13 @@ msgstr "%s 的內容"
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:1044
 #, fuzzy
 msgid "Codage CX"
-msgstr "編碼"
+msgstr "CX 編碼"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:117
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/biblio_framework.tmpl:109
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:106
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:175
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl:131
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:117
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/biblio_framework.tmpl:109
 msgid "Code"
 msgstr "編碼"
 
@@ -5667,15 +5672,14 @@ msgstr "編碼"
 msgid "Code date publication"
 msgstr "出版日期碼"
 
-# XXX tentative
+#  NOTE No, this makes no sense, but is the correct translation according to CMARC
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:13
-#, fuzzy
 msgid "Code de date de publication"
-msgstr "出版日期碼"
+msgstr "出版情況"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:363
 msgid "Code de modification de la notice"
-msgstr ""
+msgstr "修正紀錄代碼"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:102
 msgid "Code de representation du relief 1:"
@@ -5693,11 +5697,9 @@ msgstr ""
 msgid "Code de representation du relief 4:"
 msgstr ""
 
-# XXX tentative
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:397
-#, fuzzy
 msgid "Code de transliteration"
-msgstr "出版日期碼"
+msgstr "音譯代碼"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:18
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:20
@@ -5707,16 +5709,12 @@ msgstr "出版日期碼"
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:645
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:843
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:845
-#, fuzzy
 msgid "Collage"
-msgstr "修改"
+msgstr "拼貼 (collage)"
 
-#  NOTE 存放地點 used by HKPL; libraries in Taiwan seems to always write 館藏地
-#  NOTE The HKPL term seems to be more understandable
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_225a.tmpl:7
-#, fuzzy
 msgid "Collection"
-msgstr "存放地點"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_110.tmpl:24
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_110.tmpl:26
@@ -5757,14 +5755,11 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:768
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:770
 msgid "Colorie a la main"
-msgstr ""
+msgstr "人工上色"
 
-#  NOTE MARC21 的 440$v, "Volume number/sequential designation (NR)", 例如 "v.1" 等
-#  NOTE 對應 CMARC 的 225$v,「集叢號」
 #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:35
-#, fuzzy
 msgid "Columns"
-msgstr "集叢號"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_135a.tmpl:43
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_135a.tmpl:45
@@ -5852,9 +5847,8 @@ msgstr "以機讀格式查詢"
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:726
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:778
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:780
-#, fuzzy
 msgid "Composite"
-msgstr "數量"
+msgstr "以上多種情況組合"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_125b.tmpl:68
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_125b.tmpl:70
@@ -5903,15 +5897,14 @@ msgstr "請確認移除："
 #. %1$s: TMPL_VAR name=branchname
 #. %2$s: TMPL_VAR name=branchcode
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:75
-#, fuzzy, c-format
+#, c-format
 msgid "Confirm deletion of %s (%s)?"
-msgstr "請確認移除："
+msgstr "請確認移除 %s (%s)?"
 
 #. INPUT type=submit
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:212
-#, fuzzy
 msgid "Confirm issue"
-msgstr "確認密碼"
+msgstr "請確認借出"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:624
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:627
@@ -5949,8 +5942,8 @@ msgstr ""
 msgid "Consider the formula <b>N°{X}/{Y}</b>. The following XYZ settings :"
 msgstr ""
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:113
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:90
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:113
 #, fuzzy
 msgid "Constraints"
 msgstr "包含"
@@ -5979,9 +5972,8 @@ msgid "Conte de fee"
 msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:113
-#, fuzzy
 msgid "Content size"
-msgstr "%s 的內容"
+msgstr "書目數量"
 
 #. %1$s: TMPL_VAR name=shelfname
 #: ../../koha-tmpl/intranet-tmpl/default/en/shelves.tmpl:8
@@ -6037,7 +6029,7 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:311
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:313
 msgid "Copie de service"
-msgstr ""
+msgstr "發行片 (service copy)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/request.tmpl:38
 msgid "Copies"
@@ -6090,16 +6082,14 @@ msgid "Cordoba (Argentine)"
 msgstr ""
 
 #  NOTE 譯文更動 by Arthur
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:31
-msgid "Core team"
-msgstr "主要組員"
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:22
+msgid "Core team for 2.2"
+msgstr "2.2 版主要組員"
 
-#  NOTE 譯文更動 by Arthur
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:627
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:629
-#, fuzzy
 msgid "Coreen"
-msgstr "主要組員"
+msgstr "韓文"
 
 # XXX tentative
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128b.tmpl:28
@@ -6110,7 +6100,7 @@ msgstr "主要組員"
 msgid "Cornet a piston"
 msgstr "出版日期碼"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:13
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:16
 #, fuzzy
 msgid "Cost"
 msgstr "遺失"
@@ -6122,30 +6112,27 @@ msgstr "遺失"
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:743
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:229
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:231
-#, fuzzy
 msgid "Couleur"
-msgstr "重設"
+msgstr "彩色 (color)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:215
-#, fuzzy
 msgid "Couleur:"
-msgstr "重設"
+msgstr "色彩："
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:120
-#, fuzzy
+#: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:119
 msgid "Country Code"
-msgstr "類別編號"
+msgstr "國家編號"
 
 #. %1$S: type=text name=countryCode
 #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:22
 #, c-format
-msgid "Country Code&nbsp%S"
-msgstr ""
+msgid "Country Code &nbsp;%S"
+msgstr "國家編號　%S"
 
 #. %1$S: type=text name=countryName
 #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:18
 #, c-format
-msgid "Country Name&nbsp%S"
+msgid "Country Name &nbsp;%S"
 msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:108
@@ -6204,7 +6191,7 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:93
 msgid "Couverture nuageuse exprimee en huitieme:"
-msgstr ""
+msgstr "雲量（以 1/8 為單位）："
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_124g.tmpl:65
 msgid "Couverture passive par onde micrometrique"
@@ -6217,7 +6204,7 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:137
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:139
 msgid "Couverture totale"
-msgstr ""
+msgstr "全部雲遮"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:336
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:338
@@ -6226,20 +6213,19 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:735
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:737
 msgid "Craie"
-msgstr ""
+msgstr "粉筆 (chalk)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:342
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:541
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:741
 msgid "Craie noire"
-msgstr ""
+msgstr "黑色粉筆 (black chalk)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:344
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:543
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:743
-#, fuzzy
 msgid "Craie nore"
-msgstr "類別"
+msgstr "黑色粉筆 (black chalk)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:295
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:297
@@ -6248,7 +6234,7 @@ msgstr "類別"
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:694
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:696
 msgid "Crayon"
-msgstr ""
+msgstr "鉛筆 (pencil)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:308
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:310
@@ -6257,7 +6243,7 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:707
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:709
 msgid "Crayon de couleur"
-msgstr ""
+msgstr "彩色鉛筆 (colour pencil)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbooks.tmpl:19
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbooks.tmpl:29
@@ -6271,7 +6257,7 @@ msgid "Create a new authority/thesaurus entry : %S"
 msgstr "建立新的權威/同義字條目：%S"
 
 #. %1$s: TMPL_VAR name=authtypecode
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:108
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:109
 #, c-format
 msgid "Create authority framework for %s using"
 msgstr ""
@@ -6292,10 +6278,6 @@ msgstr "排序"
 msgid "Credit"
 msgstr ""
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:29
-msgid "Credits"
-msgstr "鳴謝："
-
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_141.tmpl:23
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_141.tmpl:25
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_141.tmpl:78
@@ -6323,7 +6305,6 @@ msgid "Currencies admin"
 msgstr "貨幣管理"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/currency.tmpl:2
-#, fuzzy
 msgid "Currencies administration"
 msgstr "貨幣管理"
 
@@ -6342,7 +6323,7 @@ msgstr "沒有填寫貨幣名稱"
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:43
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:45
 msgid "Cylindre"
-msgstr ""
+msgstr "圓形錄音筒"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:697
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:700
@@ -6354,18 +6335,17 @@ msgstr ""
 msgid "Cylindrique, de type specifique inconnu"
 msgstr ""
 
+#  NOTE UNIMARC field 15ca = CMARC field 12ca. This looks unlikely be should be correct
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:571
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:573
 msgid "Cyrillique"
-msgstr ""
+msgstr "斯拉夫語文"
 
-#  NOTE 譯文更動 by Arthur
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl:57
-#, fuzzy
 msgid "DETAILS"
-msgstr "聯絡人詳情"
+msgstr "詳情"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:65
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:46
 msgid "Daniel Holth"
 msgstr "Daniel Holth"
 
@@ -6415,19 +6395,19 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:118
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:120
-#, fuzzy
 msgid "Danse"
-msgstr "日期"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_124c.tmpl:63
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_124c.tmpl:65
 msgid "Dasymetrique"
 msgstr ""
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:99
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:164
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl:172
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:233
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:222
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:233
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/currency.tmpl:144
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:97
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:94
@@ -6435,14 +6415,13 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/stopwords.tmpl:102
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl:131
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl:186
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:98
 msgid "Data deleted"
 msgstr "資料已移除"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:147
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl:134
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:153
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:149
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:153
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/currency.tmpl:89
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/printers.tmpl:105
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/stopwords.tmpl:83
@@ -6472,10 +6451,9 @@ msgstr "應歸還日期"
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:9
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:664
 msgid "Date d'enregistrement"
-msgstr "登記日期"
+msgstr "輸入日期"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/readingrec.tmpl:21
-#, fuzzy
 msgid "Date due"
 msgstr "應歸還日期"
 
@@ -6488,9 +6466,9 @@ msgstr "出生日期 (%s) %S"
 
 #. %1$s: TMPL_VAR name=dateformat
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/jmemberentry.tmpl:63
-#, fuzzy, c-format
+#, c-format
 msgid "Date of Birth (%s)*"
-msgstr "出生日期 (%s) %S"
+msgstr "出生日期 (%s)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/newjmember.tmpl:59
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/newmember.tmpl:87
@@ -6506,15 +6484,13 @@ msgstr "日期/時間"
 msgid "Date:"
 msgstr "日期："
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:66
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:47
 msgid "David Strainchamps"
 msgstr "David Strainchamps"
 
-# FIXME BUG in English template
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:73
-#, fuzzy
 msgid "Day"
-msgstr "日%0.0s"
+msgstr "日"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:668
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:670
@@ -6523,50 +6499,45 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:561
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:563
-#, fuzzy
 msgid "De Lisle"
-msgstr "新增檔案"
+msgstr ""
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=LibraryName
 #. %2$s: TMPL_VAR name=title
+#: ../../koha-tmpl/intranet-tmpl/default/en/suggestion/mail_suggestion_ORDERED.tmpl:1
 #: ../../koha-tmpl/intranet-tmpl/default/en/suggestion/mail_suggestion_ACCEPTED.tmpl:1
 #: ../../koha-tmpl/intranet-tmpl/default/en/suggestion/mail_suggestion_AVAILABLE.tmpl:1
-#: ../../koha-tmpl/intranet-tmpl/default/en/suggestion/mail_suggestion_ORDERED.tmpl:1
 #: ../../koha-tmpl/intranet-tmpl/default/en/suggestion/mail_suggestion_REJECTED.tmpl:1
 #, c-format
 msgid "Dear %s user, You have suggested that the library acquire %s"
 msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:119
-#, fuzzy
 msgid "Dec"
-msgstr "應歸還日期"
+msgstr "十二月"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:249
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:251
-#, fuzzy
 msgid "Decametres"
-msgstr "移除"
+msgstr "公丈（十米）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:239
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:241
-#, fuzzy
 msgid "Decimetres"
-msgstr "移除"
+msgstr "公寸（分米）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbooks.tmpl:24
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/isbnsearch.tmpl:96
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:111
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:126
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/issuingrules.tmpl:29
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:106
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:121
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:110
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:125
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/issuingrules.tmpl:29
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:206
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:208
-#, fuzzy
 msgid "Default"
-msgstr "移除"
+msgstr "預設"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:127
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/biblio_framework.tmpl:117
@@ -6574,9 +6545,8 @@ msgid "Default framework"
 msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/issuingrules.tmpl:15
-#, fuzzy
 msgid "Default values"
-msgstr "容許值"
+msgstr "預設值"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:114
 msgid ""
@@ -6628,7 +6598,7 @@ msgstr "設定讀者的類別"
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/currency.tmpl:3
 #, fuzzy
 msgid "Define the currencies you deal with here."
-msgstr "設定讀者的類別"
+msgstr "設定您"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:53
 msgid "Define the page size for output the PDF."
@@ -6655,15 +6625,21 @@ msgstr ""
 msgid "Del"
 msgstr "移除"
 
-#. INPUT type=submit
+#: ../../koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist.tmpl:40
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/receipt-search-result.tmpl:30
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/searchresultlist.tmpl:36
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:85
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:59
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:147
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:15
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:24
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:48
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:279
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:91
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:59
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:123
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/biblio_framework.tmpl:113
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:154
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:195
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:279
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/currency.tmpl:173
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl:136
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:114
@@ -6674,19 +6650,12 @@ msgstr "移除"
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl:21
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl:121
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl:227
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:91
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:146
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:123
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/biblio_framework.tmpl:113
-#: ../../koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist.tmpl:40
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/receipt-search-result.tmpl:30
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/searchresultlist.tmpl:36
 msgid "Delete"
 msgstr "移除"
 
 #. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/default/en/shelves.tmpl:84
 #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:78
+#: ../../koha-tmpl/intranet-tmpl/default/en/shelves.tmpl:84
 msgid "Delete Shelves"
 msgstr "移除虛擬書架"
 
@@ -6694,6 +6663,10 @@ msgstr "移除虛擬書架"
 msgid "Delete a request by selecting \"del\" from the rank list."
 msgstr "取消預約，將優先次序修改為「移除」即可。"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:9
+msgid "Delete subscription"
+msgstr "移除訂閱"
+
 #. INPUT type=submit name=delete
 #: ../../koha-tmpl/intranet-tmpl/default/en/modwebsites.tmpl:25
 msgid "Delete this Website link"
@@ -6701,12 +6674,12 @@ msgstr "移除這個連結"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/deletemem.tmpl:5
 msgid "Deletion impossible"
-msgstr ""
+msgstr "無法移除"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:394
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:396
 msgid "Demi-piste"
-msgstr ""
+msgstr "雙音軌（二分跡）"
 
 #  TODO 看了原始碼，連法文原文也看了，都不知這是什麼
 #  FIXME 「依存關係」似乎是Unix術語，但這是無法翻譯中的一個暫時譯法
@@ -6720,21 +6693,21 @@ msgid ""
 "barcode. You can define wich point to start printing the page."
 msgstr ""
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:89
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:174
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:254
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:73
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:118
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/biblio_framework.tmpl:73
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/biblio_framework.tmpl:110
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:176
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:237
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:92
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:171
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:252
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:89
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:174
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:254
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl:76
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl:106
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl:132
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:73
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:118
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/biblio_framework.tmpl:73
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/biblio_framework.tmpl:110
 #: ../../koha-tmpl/intranet-tmpl/default/en/mancredit.tmpl:16
 #: ../../koha-tmpl/intranet-tmpl/default/en/maninvoice.tmpl:19
 #: ../../koha-tmpl/intranet-tmpl/default/en/modwebsites.tmpl:17
@@ -6756,16 +6729,16 @@ msgstr "說明"
 
 #. For the first occurrence,
 #. SCRIPT
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl:59
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:56
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/biblio_framework.tmpl:56
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl:59
 msgid "Description missing"
 msgstr "沒有填寫說明"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:23
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:25
 msgid "Dessin"
-msgstr ""
+msgstr "素描 (drawing)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:1486
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:1488
@@ -6789,7 +6762,7 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:64
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:66
 msgid "Dessin technique"
-msgstr ""
+msgstr "工程圖 (technical drawing)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_141.tmpl:266
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_141.tmpl:268
@@ -6806,9 +6779,8 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:561
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:759
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:761
-#, fuzzy
 msgid "Detrempe"
-msgstr "圖書資料類別"
+msgstr "蛋彩畫 (tempera)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:183
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:185
@@ -6825,11 +6797,9 @@ msgstr ""
 msgid "Deux fois par mois"
 msgstr ""
 
-# XXX tentative
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:111
-#, fuzzy
 msgid "Deuxieme date de publication"
-msgstr "出版日期碼"
+msgstr "出版年 2"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_141.tmpl:188
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_141.tmpl:190
@@ -6839,13 +6809,13 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:622
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:624
 msgid "Devanagari"
-msgstr ""
+msgstr "梵文"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/search.tmpl:32
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/cmsdsearchresults.tmpl:7
+#: ../../koha-tmpl/intranet-tmpl/default/en/help/search.marc/search.tmpl:12
 #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl:31
 #: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl:142
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/search.tmpl:32
-#: ../../koha-tmpl/intranet-tmpl/default/en/help/search.marc/search.tmpl:12
 msgid "Dewey"
 msgstr "杜威分類號"
 
@@ -6887,7 +6857,7 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:260
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:262
 msgid "Diazoique"
-msgstr ""
+msgstr "重氮 (diazo)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:423
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:425
@@ -6907,9 +6877,8 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1111
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1263
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1265
-#, fuzzy
 msgid "Dictionnaire"
-msgstr "小說類"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl:118
 msgid "Dig"
@@ -6917,15 +6886,15 @@ msgstr "鑽探"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:243
 msgid "Dimension materielle:"
-msgstr ""
+msgstr "唱片或錄音帶之直徑："
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:9
 msgid "Dimensions physiques:"
-msgstr ""
+msgstr "平面或立體："
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:96
 msgid "Dimensions:"
-msgstr ""
+msgstr "大小尺寸："
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:168
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:170
@@ -6934,7 +6903,7 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl:78
 msgid "Directly add a biblio in the library catalogue"
-msgstr ""
+msgstr "直接新增書目至圖書館目錄"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:455
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:457
@@ -6949,7 +6918,7 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:885
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:887
 msgid "Discographie"
-msgstr ""
+msgstr "錄音資料書目"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl:119
 msgid "Discount"
@@ -6973,19 +6942,18 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:18
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:20
-#, fuzzy
 msgid "Disque"
-msgstr "應歸還日期"
+msgstr "唱片"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:43
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:45
 msgid "Disque \"mere\" (positif)"
-msgstr ""
+msgstr "母模版 (mother, positive)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:38
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:40
 msgid "Disque \"pere\" (negatif)"
-msgstr ""
+msgstr "唱片母模板 (disc master, negative)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:171
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:173
@@ -6996,15 +6964,13 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:203
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:239
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:241
-#, fuzzy
 msgid "Divers"
-msgstr "-> 交貨"
+msgstr "不詳"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:123
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:125
-#, fuzzy
 msgid "Divertimentos"
-msgstr "-> 交貨"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:803
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:805
@@ -7048,20 +7014,23 @@ msgstr ""
 msgid "Document qui ne contient pas d'index"
 msgstr ""
 
+#  NOTE 暫譯，CMARC 無此分欄
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:1027
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:1029
 msgid "Dolby A"
-msgstr ""
+msgstr "杜比 A"
 
+#  NOTE 暫譯，CMARC 無此分欄
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:1032
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:1034
 msgid "Dolby B"
-msgstr ""
+msgstr "杜比 B"
 
+#  NOTE 暫譯，CMARC 無此分欄
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:1037
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:1039
 msgid "Dolby C"
-msgstr ""
+msgstr "杜比 C"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:213
 msgid "Don't issue"
@@ -7073,9 +7042,9 @@ msgstr "切勿借出"
 msgid "Donnees numeriques"
 msgstr "數碼檔案"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:67
-msgid "Dorian Meid"
-msgstr "Dorian Meid"
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:48
+msgid "Dorian Meid (German translation)"
+msgstr "Dorian Meid (德文翻譯)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:426
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:428
@@ -7083,9 +7052,8 @@ msgstr "Dorian Meid"
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:627
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:825
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:827
-#, fuzzy
 msgid "Dorure"
-msgstr "應歸還日期"
+msgstr "鍍金 (golding)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_141.tmpl:271
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_141.tmpl:273
@@ -7099,7 +7067,7 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:129
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:131
 msgid "Dos papier"
-msgstr ""
+msgstr "紙背 (paper backed)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl:76
 msgid "Dr"
@@ -7226,8 +7194,7 @@ msgstr ""
 #, fuzzy
 msgid "Each box needs to be filled in with issuelength,maxissues"
 msgstr ""
-"每欄須填寫罰款金額、過多少日開始計算罰款、以及每隔多少日罰款一次。三個數字須"
-"以半形逗號分隔。"
+"每欄須填寫借閱期限及可借資料數目，以半形逗號分隔；即 issuelength,maxissues"
 
 #  NOTE 譯文更動 by Arthur
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/cat-class-list.inc:5
@@ -7262,18 +7229,22 @@ msgstr ""
 msgid "Eckert"
 msgstr ""
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:70
-msgid "Ed Summers"
-msgstr "Ed Summers"
+#  FIXME 譯得不好
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:50
+msgid "Ed Summers (Some code and Perl packages like MARC::Record)"
+msgstr "Ed Summers（一些原始碼及 Perl 套件，包括 MARC::Record）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl:94
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:58
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:146
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:14
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:22
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:43
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:278
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:58
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:122
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/biblio_framework.tmpl:112
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:147
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:189
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:278
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/currency.tmpl:172
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl:135
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:140
@@ -7282,9 +7253,6 @@ msgstr "Ed Summers"
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl:20
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl:120
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl:226
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:145
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:122
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/biblio_framework.tmpl:112
 msgid "Edit"
 msgstr "修改"
 
@@ -7298,9 +7266,8 @@ msgid "Edit MARC subfields constraints"
 msgstr "%s 之機讀格式分欄結構管理"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:8
-#, fuzzy
 msgid "Edit subfields"
-msgstr "分欄"
+msgstr "修改分欄"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/isbnsearch.tmpl:29
 msgid "Edit..."
@@ -7354,8 +7321,8 @@ msgid ""
 "each tag in your MARC tag structure."
 msgstr ""
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:31
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:28
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:31
 #, fuzzy
 msgid "Editor constaints"
 msgstr "修改機構資料"
@@ -7372,7 +7339,7 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:181
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:183
 msgid "Elevee (31x - 60x)"
-msgstr ""
+msgstr "高縮率（31–60倍）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/imemberentry.tmpl:78
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl:184
@@ -7391,12 +7358,12 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:246
 msgid "Emulsion:"
-msgstr ""
+msgstr "軟片感光乳劑性質："
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:275
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:277
 msgid "Emulsions diverses"
-msgstr ""
+msgstr "不詳"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:611
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:613
@@ -7406,14 +7373,12 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:363
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:366
 msgid "En parties (CAD publie en serie, en periodique...)"
-msgstr ""
+msgstr "陸續出版"
 
-#  XXX 暫譯
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:605
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:607
-#, fuzzy
 msgid "En tatou"
-msgstr "截至此日"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:432
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:434
@@ -7422,7 +7387,7 @@ msgstr "截至此日"
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:831
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:833
 msgid "Encaustique"
-msgstr ""
+msgstr "蠟畫 (encaustic)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:414
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:416
@@ -7431,7 +7396,7 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:813
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:815
 msgid "Encre d'ecriture"
-msgstr ""
+msgstr "酸性淡墨水 (writing ink)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:314
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:316
@@ -7440,7 +7405,7 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:713
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:715
 msgid "Encre de chine"
-msgstr ""
+msgstr "黑墨水 (India ink)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_110.tmpl:271
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_110.tmpl:273
@@ -7456,9 +7421,9 @@ msgid "Encyclopedie"
 msgstr ""
 
 #  XXX 暫譯
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl:77
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl:14
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl:157
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl:77
 msgid "End date"
 msgstr "截至此日"
 
@@ -7480,8 +7445,6 @@ msgstr ""
 msgid "English"
 msgstr "英文"
 
-#  NOTE 譯文更動 by Arthur
-#  NOTE This is the correct translation in this context
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:23
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:25
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:117
@@ -7490,9 +7453,8 @@ msgstr "英文"
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:213
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:305
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:307
-#, fuzzy
 msgid "Enluminure"
-msgstr "網上"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:94
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:96
@@ -7513,23 +7475,20 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:278
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:372
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:374
-#, fuzzy
 msgid "Enregistrement sonore"
-msgstr "登記日期"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:38
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:40
-#, fuzzy
 msgid "Enregistrement sur fil"
-msgstr "登記日期"
+msgstr "鋼絲錄音"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:29
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:31
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_124g.tmpl:18
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_124g.tmpl:20
-#, fuzzy
 msgid "Enregistrement video"
-msgstr "登記日期"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/categorie.tmpl:20
 msgid "Enrollment Fee and Reserve Fee"
@@ -7543,7 +7502,6 @@ msgid ""
 msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/categorie.tmpl:14
-#, fuzzy
 msgid "Enrollment Period"
 msgstr "登記有效期"
 
@@ -7638,24 +7596,21 @@ msgstr "圖書資料之條碼："
 msgid "Erotica"
 msgstr ""
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/errors/401.tmpl:9
-#, fuzzy
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/401.tmpl:5
 msgid "Error 401"
-msgstr "錯誤：%s"
+msgstr "錯誤 401"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/errors/400.tmpl:9
-#: ../../koha-tmpl/intranet-tmpl/default/en/errors/402.tmpl:9
-#: ../../koha-tmpl/intranet-tmpl/default/en/errors/403.tmpl:9
-#: ../../koha-tmpl/intranet-tmpl/default/en/errors/404.tmpl:9
-#: ../../koha-tmpl/intranet-tmpl/default/en/errors/405.tmpl:9
-#, fuzzy
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/400.tmpl:5
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/402.tmpl:5
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/403.tmpl:5
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/404.tmpl:5
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/405.tmpl:5
 msgid "Error 404"
-msgstr "錯誤：%s"
+msgstr "錯誤 404"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/errors/500.tmpl:9
-#, fuzzy
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/500.tmpl:5
 msgid "Error 500"
-msgstr "錯誤：%s"
+msgstr "錯誤 500"
 
 #. %1$s: TMPL_VAR name=error
 #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/AcceptItemCopy.tmpl:7
@@ -7824,9 +7779,8 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_124f.tmpl:43
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_124f.tmpl:45
-#, fuzzy
 msgid "Explorer I"
-msgstr "匯出"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_124f.tmpl:48
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_124f.tmpl:50
@@ -7849,7 +7803,6 @@ msgstr "以機讀格式匯出。"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/pay.tmpl:8
 #: ../../koha-tmpl/intranet-tmpl/default/en/boraccount.tmpl:17
-#, fuzzy
 msgid "FINES &amp; CHARGES"
 msgstr "罰款及費用"
 
@@ -7866,21 +7819,18 @@ msgstr "%s, %s 之旗標"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1372
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1374
-#, fuzzy
 msgid "Fable"
-msgstr "女"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:72
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:74
-#, fuzzy
 msgid "Faible"
-msgstr "變數"
+msgstr "劣"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:171
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:173
-#, fuzzy
 msgid "Faible reduction"
-msgstr "複製品"
+msgstr "低縮率"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128b.tmpl:368
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128b.tmpl:370
@@ -7910,9 +7860,8 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:34
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:36
-#, fuzzy
 msgid "Faune"
-msgstr "罰款"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl:32
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl:57
@@ -7933,14 +7882,13 @@ msgid "Fax: %s"
 msgstr "傳真：%s"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:109
-#, fuzzy
 msgid "Feb"
-msgstr "費用"
+msgstr "二月"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:288
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:290
 msgid "Federal/national"
-msgstr ""
+msgstr "中央機構"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/newmember.tmpl:50
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:260
@@ -7948,7 +7896,6 @@ msgid "Fee"
 msgstr "費用"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:18
-#, fuzzy
 msgid "Fee: $30/year, Paid"
 msgstr "費用：每年$30，已付"
 
@@ -7991,14 +7938,13 @@ msgstr "要Koha能正常運作，請您務必依次做好下列的各項設定"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:19
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:21
-#, fuzzy
 msgid "Film"
-msgstr "欄位"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:53
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:55
 msgid "Film (film sonore)"
-msgstr ""
+msgstr "影片上之聲帶"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:1134
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:1136
@@ -8078,14 +8024,12 @@ msgstr ""
 
 #. INPUT type=submit
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/currency.tmpl:154
-#, fuzzy
 msgid "Filter"
-msgstr "印表機"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/histsearch.tmpl:17
-#, fuzzy
 msgid "Filter on"
-msgstr "小說類"
+msgstr ""
 
 #. %1$S: type=text name=title
 #. %2$S: type=text name=author
@@ -8096,7 +8040,6 @@ msgid "Filter on : title: %S author: %S publisher: %S"
 msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:258
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:257
 #: ../../koha-tmpl/intranet-tmpl/default/en/maninvoice.tmpl:11
 msgid "Fine"
 msgstr "罰款"
@@ -8108,9 +8051,10 @@ msgstr "罰款類別"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:98
 msgid "Fines &amp; charges"
-msgstr ""
+msgstr "罰款及費用"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/member.tmpl:19
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/member-quicksearch-results.tmpl:12
 msgid "Firstname"
 msgstr "名"
 
@@ -8122,14 +8066,12 @@ msgstr "改正圖書資料類別"
 msgid "Flags"
 msgstr "旗標"
 
-#  XXX 暫譯
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:40
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:42
-#, fuzzy
 msgid "Flore"
-msgstr "公有"
+msgstr ""
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:71
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:52
 msgid "Florian Bischof"
 msgstr "Florian Bischof"
 
@@ -8185,10 +8127,14 @@ msgstr ""
 #. SCRIPT
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl:493
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem.tmpl:111
+#: ../../koha-tmpl/intranet-tmpl/default/en/authorities/authorities.tmpl:171
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:55
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:116
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl:98
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:60
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:56
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/biblio_framework.tmpl:56
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:61
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:60
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/currency.tmpl:57
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl:59
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:55
@@ -8196,10 +8142,6 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/stopwords.tmpl:54
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl:56
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl:72
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:55
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:56
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/biblio_framework.tmpl:56
-#: ../../koha-tmpl/intranet-tmpl/default/en/authorities/authorities.tmpl:171
 msgid "Form not submitted because of the following problem(s)"
 msgstr "無法遞交表格，因為發現以下問題："
 
@@ -8237,9 +8179,8 @@ msgid "Forme de la composition:"
 msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:274
-#, fuzzy
 msgid "Forme de reproduction:"
-msgstr "複製品"
+msgstr "複製方法："
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_124b.tmpl:9
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_125b.tmpl:9
@@ -8248,7 +8189,7 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:348
 msgid "Forme materielle d'edition:"
-msgstr ""
+msgstr "出版形式："
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1522
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1524
@@ -8285,9 +8226,9 @@ msgstr "沒有填寫類別編號"
 #. %1$s: TMPL_VAR name=frameworktext
 #. %2$s: TMPL_VAR name=frameworkcode
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/biblio_framework.tmpl:84
-#, fuzzy, c-format
+#, c-format
 msgid "Framework for %s (%s)"
-msgstr "替 %s %s 繳交罰款"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/biblio_framework.tmpl:68
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/biblio_framework.tmpl:70
@@ -8295,7 +8236,7 @@ msgstr "替 %s %s 繳交罰款"
 msgid "Framework type"
 msgstr "罰款類別"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:72
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:53
 msgid "Francisco M. Marzoa Alonso"
 msgstr "Francisco M. Marzoa Alonso"
 
@@ -8306,11 +8247,12 @@ msgstr "Francisco M. Marzoa Alonso"
 #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:174
 #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:176
 msgid "Free"
-msgstr "公有"
+msgstr "公家書架"
 
+# FIXME poor translation
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:45
 msgid "Free Software ILS"
-msgstr ""
+msgstr "自由軟件的整合圖書館系統"
 
 # FIXME poor translation
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl:116
@@ -8330,25 +8272,24 @@ msgstr "法文"
 msgid "Frequency (*)"
 msgstr ""
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:21
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:24
 msgid "Frequency (*):"
 msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:60
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:114
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:116
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:70
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:73
 msgid "Friday"
-msgstr ""
+msgstr "星期五"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/branchtransfers.tmpl:128
 msgid "From"
 msgstr "由"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:85
-#, fuzzy
+#: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:84
 msgid "From:"
-msgstr "由"
+msgstr "由："
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:48
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:50
@@ -8371,18 +8312,16 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:128
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:130
-#, fuzzy
 msgid "Fugues"
-msgstr "預算案"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl:11
 msgid "Full MARC Record available at bottom"
 msgstr "完整的機讀格式記錄在下面"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl:212
-#, fuzzy
 msgid "Full Name"
-msgstr "名稱"
+msgstr "全名"
 
 #  NOTE 譯文更動 by Arthur
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/readingrec.tmpl:9
@@ -8394,19 +8333,19 @@ msgstr "完整結果"
 msgid "Fund <a1>[order]</a>"
 msgstr ""
 
+#  TODO check 蠟筆 (crayon)
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:402
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:404
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:601
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:603
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:801
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:803
-#, fuzzy
 msgid "Fusain"
-msgstr "罰款"
+msgstr ""
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/acqui/recieveorder.tmpl:14
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl:64
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl:71
+#: ../../koha-tmpl/intranet-tmpl/default/en/acqui/recieveorder.tmpl:14
 msgid "GST"
 msgstr "貨勞稅"
 
@@ -8421,9 +8360,8 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:656
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:658
-#, fuzzy
 msgid "Gauss"
-msgstr "類別"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl:25
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/newmember.tmpl:238
@@ -8441,29 +8379,27 @@ msgid "General Notes:"
 msgstr "一般備註："
 
 #. INPUT type=submit name=B1
-#: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:177
-#, fuzzy
+#: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:171
 msgid "Generate Barcodes"
-msgstr "圖書資料之條碼："
+msgstr "產生條碼"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:96
-#, fuzzy
 msgid "Generate barcodes"
-msgstr "一般備註"
+msgstr "產生條碼"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:47
-msgid "Generate barcodes from inventary codes"
-msgstr ""
+#, fuzzy
+msgid "Generate barcodes from inventory codes"
+msgstr "一般備註"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:292
-#, fuzzy
 msgid "Generation (copies):"
-msgstr "一般備註："
+msgstr "軟片版類別 (generation)："
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:321
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:323
 msgid "Generations diverses"
-msgstr ""
+msgstr "混合"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:99
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:101
@@ -8486,8 +8422,8 @@ msgstr "德文"
 msgid "Get It !"
 msgstr ""
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_210c.tmpl:65
 #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist-auth.tmpl:64
+#: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_210c.tmpl:65
 msgid "Get It!"
 msgstr ""
 
@@ -8509,7 +8445,7 @@ msgstr "名"
 msgid "Given Names*"
 msgstr "名*"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:73
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:54
 msgid "Glen Stewart"
 msgstr "Glen Stewart"
 
@@ -8549,7 +8485,7 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:765
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:767
 msgid "Gouache"
-msgstr ""
+msgstr "不透明水彩顏料 (gouache)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128b.tmpl:118
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128b.tmpl:120
@@ -8565,7 +8501,7 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:701
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:703
 msgid "Graphite"
-msgstr ""
+msgstr "石墨 (graphite)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:58
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:60
@@ -8580,7 +8516,7 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:692
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:694
 msgid "Gravure"
-msgstr ""
+msgstr "版畫 (print)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:682
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:684
@@ -8599,17 +8535,17 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:18
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:20
 msgid "Gravure directe"
-msgstr ""
+msgstr "現場錄音者（定點錄音）(instantaneous)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:170
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:172
 msgid "Gravure inconnue"
-msgstr ""
+msgstr "不詳"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:160
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:162
 msgid "Gravure laterale ou combinee"
-msgstr ""
+msgstr "側面切割式"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:1038
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:1040
@@ -8650,20 +8586,19 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:165
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:167
 msgid "Gravure verticale"
-msgstr ""
+msgstr "高低式起伏"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:607
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:609
-#, fuzzy
 msgid "Grec"
-msgstr "法文"
+msgstr "希臘文"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:786
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:788
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:1061
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:1063
 msgid "Greenwich (G.B.)"
-msgstr ""
+msgstr "格林尼治（英國）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/maint/catmaintain.tmpl:78
 msgid "Group Maintenance"
@@ -8681,14 +8616,19 @@ msgstr "擔保："
 msgid "Guarantor:"
 msgstr "擔保人："
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:34
+msgid ""
+"Gynn Lomax, Richard Anderson, Jeremy Blake, Rebecca Holden, Olive T. Canine"
+msgstr ""
+"Gynn Lomax、Richard Anderson、Jeremy Blake、Rebecca Holden、Olive T. Canine"
+
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl:66
 msgid "HELP"
 msgstr "說明"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl:74
-#, fuzzy
 msgid "HELP Ordering"
-msgstr "採購說明："
+msgstr "訂購說明"
 
 #  NOTE 譯文更動 by Arthur
 #. INPUT type=submit
@@ -8706,12 +8646,11 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/issuingrules.tmpl:8
 msgid "HINT for fines"
-msgstr ""
+msgstr "罰款提示"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/issuingrules.tmpl:5
-#, fuzzy
 msgid "HINT for issues"
-msgstr "借出次數"
+msgstr "借出說明"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/authorised_values.tmpl:8
 msgid ""
@@ -8735,9 +8674,8 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:300
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:383
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:385
-#, fuzzy
 msgid "Hachures"
-msgstr "分館"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1452
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1454
@@ -8773,13 +8711,12 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:612
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:614
 msgid "Hebreu"
-msgstr ""
+msgstr "希伯來文"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:254
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:256
-#, fuzzy
 msgid "Hectometres"
-msgstr "住宅地址"
+msgstr "公引（百米）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:925
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:927
@@ -8792,16 +8729,16 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-bottom.inc:13
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/about-bottom.inc:13
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/auth-search-bottom.inc:14
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/auth-bottom.inc:14
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/circulation-bottom.inc:13
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/bull-bottom.inc:13
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/cat-bottom.inc:13
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/parameters-bottom.inc:13
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/error-bottom.inc:13
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/issues-bottom.inc:13
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/members-bottom.inc:13
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/reports-bottom.inc:13
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/auth-bottom.inc:14
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/auth-search-bottom.inc:14
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/bull-bottom.inc:13
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/error-bottom.inc:13
 #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes-bottom.inc:13
 msgid "Help"
 msgstr "線上說明"
@@ -8811,7 +8748,7 @@ msgstr "線上說明"
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:1141
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:1143
 msgid "Helsinky (Finlande)"
-msgstr ""
+msgstr "赫爾辛基（芬蘭）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_123d.tmpl:9
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_123e.tmpl:9
@@ -8821,7 +8758,7 @@ msgstr ""
 msgid "Hemisphere:"
 msgstr "已預約："
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:74
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:55
 msgid "Henri-Damien Laurent"
 msgstr "Henri-Damien Laurent"
 
@@ -8843,9 +8780,8 @@ msgid "Heure:"
 msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbooks.tmpl:35
-#, fuzzy
 msgid "Hint"
-msgstr "列印"
+msgstr "提示"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_125b.tmpl:33
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_125b.tmpl:35
@@ -8854,18 +8790,18 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-bottom.inc:5
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/about-bottom.inc:5
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/auth-search-bottom.inc:5
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/auth-bottom.inc:5
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/circulation-bottom.inc:5
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/bull-bottom.inc:5
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/cat-bottom.inc:5
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/parameters-bottom.inc:5
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/error-bottom.inc:5
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/issues-bottom.inc:5
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/members-bottom.inc:5
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/opac-bottom.inc:12
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/opac-top.inc:56
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/reports-bottom.inc:5
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/auth-bottom.inc:5
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/auth-search-bottom.inc:5
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/bull-bottom.inc:5
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/error-bottom.inc:5
 #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes-bottom.inc:5
 msgid "Home"
 msgstr "主頁"
@@ -8922,9 +8858,8 @@ msgstr "主機名稱"
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:579
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:777
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:779
-#, fuzzy
 msgid "Huile"
-msgstr "副題"
+msgstr "油彩 (oil)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:1062
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:1064
@@ -8937,9 +8872,8 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:25
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:148
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:150
-#, fuzzy
 msgid "Hymnes"
-msgstr "主頁"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:179
 msgid "I need confirmation before issuing"
@@ -8994,9 +8928,9 @@ msgstr "國際標準書號 %s"
 #. %1$s: TMPL_VAR name=isbn
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/suggestion-select.tmpl:37
 #: ../../koha-tmpl/intranet-tmpl/default/en/suggestion/acceptorreject.tmpl:28
-#, fuzzy, c-format
+#, c-format
 msgid "ISBN :<i>%s</i>"
-msgstr "<b>國際標準書號：</b><a1>%s</a>"
+msgstr "國際標準書號：<i>%s</i>"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem-nomarc.tmpl:28
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem-nomarc.tmpl:82
@@ -9008,38 +8942,39 @@ msgstr "國際標準書號："
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:517
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:519
 msgid "ISO 5426 (jeu de caractere latin etendu)"
-msgstr ""
+msgstr "ISO 5426 (extended Latin set)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:473
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:476
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:529
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:532
 msgid "ISO 5428 (caracteres grecs)"
-msgstr ""
+msgstr "ISO 5428 (Greek set)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:480
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:483
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:536
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:539
 msgid "ISO 6438 (caracteres africains codes)"
-msgstr ""
+msgstr "ISO 6438 (African coded character set)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:446
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:449
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:502
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:505
 msgid "ISO 646, version IRV (caracteres latins de base)"
-msgstr ""
+msgstr "ISO 646, IRV version (basic Latin set)"
 
+#  NOTE CMARC 無此值
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:466
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:469
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:522
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:525
 msgid "ISO DIS 5427 (jeu de caracteres cyrilliques etendu)"
-msgstr ""
+msgstr "ISO DIS 5427 (Cyrillic extended character set)"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl:29
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/bull-home.tmpl:8
+#: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl:29
 msgid "ISSN"
 msgstr "國際標準叢刊號"
 
@@ -9129,7 +9064,6 @@ msgid "If you change a link here, EVERY framework will be modified."
 msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/koha2marclinks.tmpl:160
-#, fuzzy
 msgid ""
 "If you change the link between a MARC subfield and a non-MARC field, ask "
 "your administrator to run misc/rebuildnonmarc.pl script."
@@ -9159,8 +9093,8 @@ msgid ""
 "\" in the \"Checked\" field) and the order in which it is checked."
 msgstr ""
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/help/bull-home.tmpl:5
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/bull-home.tmpl:4
+#: ../../koha-tmpl/intranet-tmpl/default/en/help/bull-home.tmpl:5
 msgid "If you want to create a new subscription, clic on"
 msgstr ""
 
@@ -9191,7 +9125,7 @@ msgstr "忽略並返回「移交」"
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:342
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:344
 msgid "Il ne s'agit pas d'un support de securite"
-msgstr ""
+msgstr "非安全軟片基底"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:1087
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:1090
@@ -9216,24 +9150,20 @@ msgid "Ile de Fer (Iles Canaries)"
 msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:9
-#, fuzzy
 msgid "Illustration 1:"
-msgstr "插圖"
+msgstr "插圖（一）："
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:105
-#, fuzzy
 msgid "Illustration 2:"
-msgstr "插圖"
+msgstr "插圖（二）："
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:201
-#, fuzzy
 msgid "Illustration 3:"
-msgstr "插圖"
+msgstr "插圖（三）："
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:297
-#, fuzzy
 msgid "Illustration 4:"
-msgstr "插圖"
+msgstr "插圖（四）："
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:9
 #, fuzzy
@@ -9308,8 +9238,8 @@ msgstr "插圖"
 msgid "Illustrations"
 msgstr "插圖"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl:18
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/search.marc/search.tmpl:11
+#: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl:18
 msgid "Illustrator"
 msgstr "繪圖"
 
@@ -9320,17 +9250,16 @@ msgstr "繪圖："
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:52
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:54
-#, fuzzy
 msgid "Image"
-msgstr "頁數"
+msgstr "圖片 (picture)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:29
 msgid "Image cartographique originale 1:"
-msgstr ""
+msgstr "地圖最初影像（一）："
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:68
 msgid "Image cartographique originale 2:"
-msgstr ""
+msgstr "地圖最初影像（二）："
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_124a.tmpl:28
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_124a.tmpl:30
@@ -9404,25 +9333,24 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:298
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:301
 msgid "Impression par transfert ligne a ligne"
-msgstr ""
+msgstr "轉印（如複印、曬圖等）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:240
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:242
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:288
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:290
-#, fuzzy
 msgid "Imprime"
-msgstr "匯入"
+msgstr "印刷（凸板、雕板、刻板、平板、印板、點字板等）"
+
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/500.tmpl:8
+msgid ""
+"In Koha this typically means that the Koha team is working on new features"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/newbasket2.tmpl:58
 msgid "In Transit"
 msgstr "移交中"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/errors/500.tmpl:15
-msgid ""
-"In koha this typically mean that the koha-team is working on a new options"
-msgstr ""
-
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/authtypes.tmpl:16
 msgid ""
 "In the biblio framework, the reported tag <b>MUST</b> contain a $9 subfield, "
@@ -9568,12 +9496,12 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:697
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:699
 msgid "Inconnu"
-msgstr ""
+msgstr "不詳"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_110.tmpl:161
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_110.tmpl:163
 msgid "Inconnue"
-msgstr ""
+msgstr "不詳"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_110.tmpl:475
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_110.tmpl:477
@@ -9601,9 +9529,8 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1106
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1258
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1260
-#, fuzzy
 msgid "Index"
-msgstr "下一頁"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_110.tmpl:648
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_110.tmpl:650
@@ -9640,7 +9567,7 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:895
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:897
 msgid "Index thematique"
-msgstr ""
+msgstr "(音樂) 主題目錄 (thematic index)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:29
 msgid "Indicateur d'index:"
@@ -9661,7 +9588,7 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:155
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:157
 msgid "Inferieure au cm"
-msgstr ""
+msgstr "小於 1 公分"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_124c.tmpl:103
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_124c.tmpl:105
@@ -9678,7 +9605,6 @@ msgstr "中間名稱縮寫"
 #  NOTE 微軟譯法，見 http://www.microsoft.com/taiwan/technet/Win2k/network/dcsiz/
 #  NOTE 我個人認為譯文很不通順
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl:61
-#, fuzzy
 msgid "Initials"
 msgstr "中間名稱縮寫"
 
@@ -9691,31 +9617,29 @@ msgid "Institution name*"
 msgstr "機構名稱*"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl:6
-#, fuzzy
 msgid "Institutional"
-msgstr "機構名稱"
+msgstr "機構"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_125b.tmpl:43
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_125b.tmpl:45
-#, fuzzy
 msgid "Instructions"
-msgstr "插圖"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128b.tmpl:9
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128c.tmpl:9
 msgid "Instruments ou voix dans un ensemble:"
 msgstr ""
 
+#  NOTE CMARC 無此值
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:319
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:321
 msgid "Inter-gouvernemental"
-msgstr ""
+msgstr "跨政府"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:153
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:155
-#, fuzzy
 msgid "Intermezzos"
-msgstr "圖書資料"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl:22
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/newmember.tmpl:235
@@ -9726,9 +9650,9 @@ msgstr "借書證號碼無效"
 msgid "Invalid cardnumber."
 msgstr "借書證號碼無效。"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:98
+#: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:97
 #, fuzzy
-msgid "Inventary Code"
+msgid "Inventory Code"
 msgstr "條碼"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/reports/reports-home.tmpl:9
@@ -9754,7 +9678,6 @@ msgid "Invoice Prices are"
 msgstr "發票上之價錢為"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl:12
-#, fuzzy
 msgid "Invoice number"
 msgstr "發票號碼"
 
@@ -9800,9 +9723,8 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:117
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:119
-#, fuzzy
 msgid "Isorel"
-msgstr "忽略"
+msgstr "夾板"
 
 #. INPUT type=submit
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:70
@@ -9812,18 +9734,14 @@ msgstr "借出"
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/issuingrules.tmpl:40
 #, fuzzy
 msgid "Issue / fine"
-msgstr "限借數量"
-
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:259
-msgid "Issue limit"
-msgstr "限借數量"
+msgstr "借出 / 罰款"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/lateissues.tmpl:9
 #, fuzzy
 msgid "Issue number"
 msgstr "圖書資料號碼"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:141
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:144
 msgid "Issues"
 msgstr "借出"
 
@@ -9844,7 +9762,7 @@ msgstr "借出"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:151
 msgid "Issuing impossible"
-msgstr ""
+msgstr "無法借出"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/issuingrules.tmpl:10
 msgid "Issuing length and quantity"
@@ -9856,14 +9774,10 @@ msgid ""
 "borrower category can issue for an itemtype"
 msgstr ""
 
-#  NOTE 譯文更動 by Ambrose
-#  NOTE 借出時如果出現問題（例如「這本書已借出，是否續借」一類），這便是該條問題的標題
-#  NOTE 所以只能譯成「問題」，否則會很奇怪
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:32
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/issuingrules.tmpl:2
-#, fuzzy
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:32
 msgid "Issuing rules"
-msgstr "問題"
+msgstr "借出規則"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/itemtypes.tmpl:16
 #, fuzzy
@@ -9895,9 +9809,9 @@ msgstr ""
 #. %4$s: TMPL_VAR name=name
 #. %5$s: TMPL_VAR name=borcnum
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl:15
-#, fuzzy, c-format
+#, c-format
 msgid "Item %s (%s) is marked waiting at <b>%s</b> for %s (<a1>%s</a>)."
-msgstr "在分館 <b>%s</b> 等候由 %s (<a1>%s</a>) 取書。"
+msgstr "圖書資料「%1$s」(%2$s) 現為「等候」狀態，正等候由 %4$s (<a1>%5$s</a>) 在 <b>%3$s</b> 取書。"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl:43
 msgid "Item Barcode *"
@@ -9922,9 +9836,9 @@ msgstr "數量"
 #. %1$S: type=text name=minlocation
 #. %2$S: type=text name=maxlocation
 #: ../../koha-tmpl/intranet-tmpl/default/en/reports/inventory.tmpl:7
-#, fuzzy, c-format
+#, c-format
 msgid "Item Location (items.itemcallnumber) between %S and %S"
-msgstr "圖書資料位於 (items.bulk) "
+msgstr "圖書資料位置 (items.itemcallnumber) 介乎 %S 及 %S"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/searchresults.tmpl:64
 msgid "Item Lost"
@@ -9951,9 +9865,8 @@ msgid "Item added with barcode %s"
 msgstr "已新增條碼為 %s 的圖書資料"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl:69
-#, fuzzy
 msgid "Item barcode"
-msgstr "圖書資料之條碼："
+msgstr "圖書資料之條碼"
 
 #  NOTE 譯文更動 by Arthur
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/branchtransfers.tmpl:97
@@ -9968,17 +9881,15 @@ msgstr "圖書資料已在指定分館。"
 msgid "Item is marked waiting at %s for %s (<a1>%s</a>)."
 msgstr "圖書資料已標記為在 %s 等候由 %s (<a1>%s</a>) 取書。"
 
-# XXX what is this?!
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:218
-#, fuzzy
 msgid "Item issued"
-msgstr "圖書資料相關欄位"
+msgstr "成功借出圖書資料"
 
 #. %1$s: TMPL_VAR name=ISSUED_TO_ANOTHER
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:193
 #, c-format
 msgid "Item issued to %s. Return &amp; issue?"
-msgstr ""
+msgstr "圖書資料已借出至 %s。立即歸還並重新借出？"
 
 #  NOTE 譯文更動 by Arthur
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/branchtransfers.tmpl:24
@@ -9988,7 +9899,6 @@ msgid "Item marked Waiting:"
 msgstr "圖書資料在等候中："
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:159
-#, fuzzy
 msgid "Item not for loan"
 msgstr "不可借出"
 
@@ -10014,7 +9924,7 @@ msgstr "圖書資料類別"
 msgid ""
 "Item type : select here an item type. If none is selected, the search is "
 "done on every item type"
-msgstr ""
+msgstr "圖書資料類別：請在此處選擇圖書資料類別。如不選擇，將搜尋所有圖書資料類別。"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl:128
 msgid "Item type Admin"
@@ -10028,10 +9938,9 @@ msgstr "圖書資料類別"
 msgid ""
 "Item types are useful for many things, and <b>very</b> important in "
 "controlling how Koha works :"
-msgstr ""
+msgstr "圖書資料類別有多種用途，而且對 Koha 的運作有<b>莫大</b>的影響："
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/itemtypes.tmpl:2
-#, fuzzy
 msgid "Item types management"
 msgstr "圖書資料類別管理"
 
@@ -10053,14 +9962,12 @@ msgid "Item was on loan to <a1>%s</a> %s and has been returned."
 msgstr "圖書資料借了給 <a1>%s</a> %s，現已歸還。"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:162
-#, fuzzy
 msgid "Item withdrawn"
 msgstr "已註銷"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem-nomarc.tmpl:34
-#, fuzzy
 msgid "Item:"
-msgstr "圖書資料"
+msgstr "圖書資料："
 
 #  NOTE 上文為「圖書資料：%s」
 #. %1$s: TMPL_VAR name=itemtitle
@@ -10099,7 +10006,7 @@ msgid "Itemnumber"
 msgstr "圖書資料號碼"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl:30
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:337
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:377
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl:40
 msgid "Items"
 msgstr "圖書資料"
@@ -10113,12 +10020,11 @@ msgstr "%s 過期未還之圖書資料"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:162
 msgid "Items currently on issue"
-msgstr ""
+msgstr "借出的資料"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:114
-#, fuzzy
 msgid "Items requested"
-msgstr "已預約"
+msgstr "預約的資料"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:171
 msgid "Itemtype"
@@ -10136,7 +10042,6 @@ msgid "Itemtype:%S"
 msgstr "圖書資料類別：%S"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/reports-top.inc:47
-#, fuzzy
 msgid "Itemtypes"
 msgstr "圖書資料類別"
 
@@ -10153,32 +10058,30 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:457
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:628
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:630
-#, fuzzy
 msgid "Ivoire"
-msgstr "忽略"
+msgstr "象牙"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:108
-#, fuzzy
 msgid "Jan"
-msgstr "任何"
+msgstr "一月"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:591
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:594
 msgid "Japonais - Kana"
-msgstr ""
+msgstr "日文假名"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:584
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:587
 msgid "Japonais - Kanji"
-msgstr ""
+msgstr "日文漢字"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:577
 msgid "Japonais - alphabet non precise"
-msgstr ""
+msgstr "日文"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:580
 msgid "Japonais non precise"
-msgstr ""
+msgstr "日文"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:158
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:160
@@ -10187,7 +10090,7 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:549
 msgid "Jeu de caracteres additionnels"
-msgstr ""
+msgstr "附加字集"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:127
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:130
@@ -10196,7 +10099,7 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:235
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:238
 msgid "Jeunesse en general"
-msgstr ""
+msgstr "青少年，一般性（當 b、c、d、e 未使用或不適用時）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:138
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:140
@@ -10205,18 +10108,18 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:436
 msgid "Jeux de caracteres (obligatoire) 1"
-msgstr ""
+msgstr "字集（必備）（一）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:492
 msgid "Jeux de caracteres (obligatoire) 2"
-msgstr ""
+msgstr "字集（必備）（二）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:58
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:60
 msgid "Jeux de patience (puzzle)"
 msgstr ""
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:46
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:56
 msgid "Jo Ransom"
 msgstr "Jo Ransom"
 
@@ -10253,12 +10156,6 @@ msgstr "登記日期"
 msgid "Joining branch: %s"
 msgstr "登記之館別：%s"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:37
-msgid ""
-"Joshua Ferraro &amp; the <b>Nelsonville Public Library</b> (MARC features "
-"funders)"
-msgstr "Joshua Ferraro 及 <b>Nelsonville 市立圖書館</b> (機讀目錄功能融資)"
-
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:144
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:146
 #, fuzzy
@@ -10274,9 +10171,8 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_106.tmpl:32
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_110.tmpl:29
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_110.tmpl:31
-#, fuzzy
 msgid "Journal"
-msgstr "一般"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1442
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1444
@@ -10290,7 +10186,7 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:114
 msgid "Jul"
-msgstr ""
+msgstr "七月"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:890
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:892
@@ -10301,7 +10197,7 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:113
 msgid "Jun"
-msgstr ""
+msgstr "六月"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/cat-class-list.inc:8
 msgid "Junior Fiction"
@@ -10313,17 +10209,11 @@ msgstr "兒童非小說類"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_110.tmpl:328
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_110.tmpl:330
-#, fuzzy
 msgid "Jurisprudence"
-msgstr "貨幣"
-
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:75
-msgid "Jérome Vizcaino (Esiee School)"
-msgstr "J&eacute;rome Vizcaino (ESIEE學院)"
+msgstr ""
 
-#. IMG
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/opac-top.inc:64
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/error-top.inc:42
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/opac-top.inc:64
 #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes-top.inc:205
 msgid "KOHA"
 msgstr "KOHA"
@@ -10334,9 +10224,8 @@ msgid "KOHA: Catalogue Search"
 msgstr "KOHA：查詢館藏"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/about-top.inc:5
-#, fuzzy
 msgid "KOHA: INTRANET: About"
-msgstr "KOHA：INTRANET：報表"
+msgstr "KOHA：INTRANET：關於"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-top.inc:5
 msgid "KOHA: INTRANET: Acquisitions"
@@ -10344,9 +10233,8 @@ msgstr "KOHA：INTRANET：採購"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/auth-search-top.inc:5
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/auth-top.inc:5
-#, fuzzy
 msgid "KOHA: INTRANET: Authorities"
-msgstr "KOHA：INTRANET：採購"
+msgstr "KOHA：INTRANET：權威"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc:4
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/error-top.inc:5
@@ -10373,9 +10261,8 @@ msgid "KOHA: INTRANET: Reports"
 msgstr "KOHA：INTRANET：報表"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/bull-top.inc:5
-#, fuzzy
 msgid "KOHA: INTRANET: Serials management"
-msgstr "KOHA：INTRANET：設定"
+msgstr "KOHA：INTRANET：期刊管理"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/opac-top.inc:6
 msgid "KOHA: OPAC Catalogue Search"
@@ -10383,7 +10270,11 @@ msgstr "KOHA：查詢線上目錄"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/help-top.inc:5
 msgid "KOHA: online help"
-msgstr ""
+msgstr "KOHA：線上說明"
+
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:29
+msgid "Katipo Communications"
+msgstr "Katipo Communications"
 
 #  NOTE 譯文更動 by Arthur
 #: ../../koha-tmpl/intranet-tmpl/default/en/user/userpage.tmpl:57
@@ -10396,37 +10287,36 @@ msgstr "關鍵詞"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/search.marc/search.tmpl:7
 msgid "Keyword : search on anything"
-msgstr ""
+msgstr "關鍵詞：搜尋任何東西"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/catalogue-home.tmpl:15
-#, fuzzy
 msgid "Keywords:"
-msgstr "關鍵詞"
+msgstr "關鍵詞："
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:259
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:261
 msgid "Kilometres"
-msgstr ""
+msgstr "公里（千米）"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:76
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:57
 msgid "Kip DeGraaf"
 msgstr "Kip DeGraaf"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:45
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/about-top.inc:34
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-top.inc:34
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/auth-top.inc:54
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/bull-top.inc:34
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc:38
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/circulation-top.inc:49
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/error-top.inc:43
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/marc-top.inc:44
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/members-top.inc:34
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/parameters-top.inc:35
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/reports-top.inc:34
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/auth-top.inc:54
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/bull-top.inc:34
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/error-top.inc:43
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/marc-top.inc:44
 #: ../../koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl:65
-#: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:45
 msgid "Koha"
-msgstr ""
+msgstr "Koha"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/koha2marclinks.tmpl:2
 #, fuzzy
@@ -10443,11 +10333,11 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl:69
 msgid "Koha : gift, donation or contribution"
-msgstr ""
+msgstr "Koha：禮物、捐贈、或捐助也"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/auth.tmpl:36
 msgid "Koha Login"
-msgstr "登入Koha"
+msgstr "登入 Koha"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/authorised_values.tmpl:3
 msgid ""
@@ -10491,19 +10381,19 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/koha2marclinks.tmpl:169
 msgid "Koha field"
-msgstr "Koha欄位"
+msgstr "Koha 欄位"
 
 #. %1$s: TMPL_VAR name=kohafield
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:130
-#, fuzzy, c-format
+#, c-format
 msgid "Koha field : %s,"
-msgstr "Koha欄位"
+msgstr "Koha 欄位：%s"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl:99
 msgid ""
 "Koha internal (you should have no reasons to modify the following default "
 "values)"
-msgstr ""
+msgstr "Koha 內部使用（你毋須修對以下的預設值作出任何修改）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/marc_subfields_structure.tmpl:14
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/marctagstructure.tmpl:14
@@ -10518,13 +10408,12 @@ msgid ""
 msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:30
-#, fuzzy
 msgid "Koha link:"
-msgstr "登入Koha"
+msgstr "Koha 連結："
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:9
-msgid "Koha version:"
-msgstr "Koha版本："
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:8
+msgid "Koha version"
+msgstr "Koha 版本"
 
 #. IMG
 #: ../../koha-tmpl/intranet-tmpl/default/en/opac-main.tmpl:52
@@ -10534,7 +10423,7 @@ msgstr "Koha：赫羅范努瓦圖書館信託之線上目錄及讀者服務"
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:368
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:370
 msgid "L'enregistrement n'est pas une bande"
-msgstr ""
+msgstr "非錄音"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl:30
 msgid "LCCN"
@@ -10563,17 +10452,19 @@ msgstr ""
 msgid "La date tombe avant l'an 1 du calendrier gregorien"
 msgstr ""
 
+#  FIXME spelling mistake in source
 #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:26
 msgid "Label heigth (Expressed in mm)"
-msgstr ""
+msgstr "標籤高度（公厘 / 毫米）"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:159
+# XXX
+#: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:156
 msgid "Label number to start printing"
-msgstr ""
+msgstr "起首列印之標籤號碼"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:23
 msgid "Label width (Expressed in mm)"
-msgstr ""
+msgstr "標籤闊度（公厘 / 毫米）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:674
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:676
@@ -10601,26 +10492,25 @@ msgstr "語言"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:388
 msgid "Langue de catalogage (obligatoire)"
-msgstr ""
+msgstr "編目語文（必備）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:104
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:106
-#, fuzzy
 msgid "Laque"
-msgstr "語言"
+msgstr "lacquered（如，醋酸鹽等）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:216
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:218
 msgid "Large/standard"
-msgstr ""
+msgstr "標準形"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:324
 msgid "Largeur de la bande:"
-msgstr ""
+msgstr "錄音帶寬度："
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:207
 msgid "Largeur du sillon:"
-msgstr ""
+msgstr "唱片紋寬："
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:248
 msgid "Largeur ou dimension"
@@ -10638,7 +10528,7 @@ msgid "Last seen at branch"
 msgstr "最近出現在分館"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:191
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:132
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:135
 #, fuzzy
 msgid "Last value"
 msgstr "容許值"
@@ -10652,10 +10542,9 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl:47
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl:49
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:164
-#, fuzzy
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:167
 msgid "Late"
-msgstr "日期"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/statecollection.tmpl:8
 msgid ""
@@ -10669,19 +10558,15 @@ msgstr ""
 msgid "Late issues"
 msgstr "應歸還日期"
 
-# FIXME Untranslatable. Arguably template bug, but difficult to fix.
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/lateissues.tmpl:10
 #, fuzzy
 msgid "Late since"
 msgstr "右列日期起未出現過"
 
-#  NOTE 存放地點 used by HKPL; libraries in Taiwan seems to always write 館藏地
-#  NOTE The HKPL term seems to be more understandable
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:566
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:568
-#, fuzzy
 msgid "Latin"
-msgstr "存放地點"
+msgstr "拉丁文"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:321
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:323
@@ -10690,14 +10575,14 @@ msgstr "存放地點"
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:720
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:722
 msgid "Lavis"
-msgstr ""
+msgstr "油墨 (lavierung India ink)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:833
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:836
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:1108
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:1111
 msgid "Le Cap (Afrique du sud)"
-msgstr ""
+msgstr "好望角（南非）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:1020
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:1022
@@ -10722,12 +10607,12 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:73
 #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:75
 msgid "Legal"
-msgstr ""
+msgstr "Legal"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:68
 #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:70
 msgid "Letter"
-msgstr ""
+msgstr "Letter"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:28
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:30
@@ -10745,13 +10630,12 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:1069
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1407
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1409
-#, fuzzy
 msgid "Lettres"
-msgstr "集叢"
+msgstr ""
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:141
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/koha2marclinks.tmpl:172
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:135
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:140
 msgid "Lib"
 msgstr "說明"
 
@@ -10769,17 +10653,15 @@ msgstr "給大眾的說明"
 msgid "Librarian"
 msgstr "給圖書館員的說明"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:11
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:14
 msgid "Librarian identity :"
 msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl:67
-#, fuzzy
 msgid "Librarian interface"
-msgstr "分館"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/branches.tmpl:3
-#, fuzzy
 msgid "Library Branches"
 msgstr "分館"
 
@@ -10788,15 +10670,19 @@ msgid "Library branches"
 msgstr "分館"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:45
-#, fuzzy
 msgid "LibraryName --"
-msgstr "分館"
+msgstr "分館名稱——"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:163
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:165
-#, fuzzy
 msgid "Lieder"
-msgstr "性別"
+msgstr ""
+
+#. %1$s: TMPL_VAR name=link
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:139
+#, c-format
+msgid "Link:%s,"
+msgstr "連結：%s、"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:48
 msgid "Links Koha - MARC DB"
@@ -10816,7 +10702,7 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:1170
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:1172
 msgid "Lisbonne (Portugal)"
-msgstr ""
+msgstr "里斯本（葡萄牙）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl:109
 msgid "List Item Price Includes GST"
@@ -10870,9 +10756,8 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1161
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1313
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1315
-#, fuzzy
 msgid "Livre de recreation"
-msgstr "編輯"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:741
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:895
@@ -10917,7 +10802,7 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:900
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:902
 msgid "Livret ou texte"
-msgstr ""
+msgstr "歌劇劇本"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:706
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:708
@@ -10944,16 +10829,16 @@ msgstr "存放地點"
 #. %1$s: TMPL_VAR name=loggedinusername
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/about-top.inc:47
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-top.inc:46
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc:57
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/circulation-top.inc:68
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/members-top.inc:52
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/parameters-top.inc:54
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/reports-top.inc:51
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/auth-search-top.inc:49
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/auth-top.inc:92
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/bull-top.inc:52
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc:57
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/circulation-top.inc:68
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/error-top.inc:62
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/marc-top.inc:64
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/members-top.inc:52
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/parameters-top.inc:54
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/reports-top.inc:51
 #: ../../koha-tmpl/intranet-tmpl/default/en/user/userpage.tmpl:4
 #: ../../koha-tmpl/intranet-tmpl/default/en/opac-main.tmpl:78
 #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes-top.inc:226
@@ -10982,12 +10867,11 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:1175
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:1177
 msgid "Londres (G.B.)"
-msgstr ""
+msgstr "倫敦（英國）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:40
-#, fuzzy
 msgid "Longueur"
-msgstr "語言"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/newbasket2.tmpl:56
 #: ../../koha-tmpl/intranet-tmpl/default/en/moditem.tmpl:19
@@ -11029,11 +10913,10 @@ msgstr "匯出機讀格式書目"
 msgid "MARC biblio management"
 msgstr "機讀格式書目管理"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:21
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:19
-#, fuzzy
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:21
 msgid "MARC constraints"
-msgstr "包含"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/koha2marclinks.tmpl:11
 msgid ""
@@ -11041,6 +10924,7 @@ msgid ""
 "simply not available for display on circulation screens and on some search "
 "results screens."
 msgstr ""
+"未被連結至 Koha 資料庫的機讀格式資料並不會消失&mdash;&mdash;它只是不會在流通畫面顯示，也不會在某些查詢館藏的結果列出。"
 
 #. %1$s: TMPL_VAR name=tagfield
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/koha2marclinks.tmpl:157
@@ -11052,7 +10936,6 @@ msgstr "機讀格式之連結 %s"
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:141
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/biblio_framework.tmpl:118
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/biblio_framework.tmpl:127
-#, fuzzy
 msgid "MARC structure"
 msgstr "機讀格式欄位結構"
 
@@ -11063,14 +10946,13 @@ msgstr "機讀格式欄位結構"
 msgid "MARC subfield structure admin for %s (framework %s)"
 msgstr "%s 之機讀格式分欄結構管理"
 
+#  FIXME need to fix the tokenizer :-(
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:4
-#, fuzzy
 msgid "MARC tag structure admin for"
-msgstr "機讀格式欄位結構管理"
+msgstr "機讀格式欄位結構管理："
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/marc_subfields_structure.tmpl:2
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/marctagstructure.tmpl:2
-#, fuzzy
 msgid "MARC tag structure administration"
 msgstr "機讀格式欄位結構管理"
 
@@ -11081,9 +10963,8 @@ msgid "MARC21"
 msgstr "MARC21"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl:57
-#, fuzzy
 msgid "MEMBER"
-msgstr "新增讀者"
+msgstr "讀者"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl:144
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/newimember.tmpl:55
@@ -11107,11 +10988,13 @@ msgstr "讀者細節"
 msgid "METEOSAT"
 msgstr ""
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:41
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:28
 msgid ""
-"MJ Ray and <b>Turo Technology LLP</b>, England (quality control, installer "
-"&amp; updater, 2.0 release maintainer)"
-msgstr "MJ Ray 及英國 <b>Turo Technology LLP</b> (品質管理、安裝程式、升級程式、第2.0版維護者)"
+"MJ Ray and <b>Turo Technology LLP</b>, (quality control, installer &amp; "
+"updater, 2.0 release maintainer)"
+msgstr ""
+"MJ Ray 及 <b>Turo Technology LLP</b> (品質管理、安裝程式、升級程式、第2.0"
+"版維護者)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/request.tmpl:77
 msgid "MODIFY EXISTING REQUESTS"
@@ -11119,9 +11002,8 @@ msgstr "修改目前的預約"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:96
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:98
-#, fuzzy
 msgid "Machines"
-msgstr "分館"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:905
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:907
@@ -11160,9 +11042,8 @@ msgstr "主清單"
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:421
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:592
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:594
-#, fuzzy
 msgid "Majolique"
-msgstr "男"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/newmember.tmpl:99
 msgid "Male"
@@ -11173,19 +11054,19 @@ msgid "Manage serial subscriptions and issues"
 msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:37
-#, fuzzy
 msgid "Managed"
-msgstr "必備"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl:9
 msgid "Managed by"
 msgstr ""
 
+# FIXME bug in tokenizer
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:40
-#, fuzzy
 msgid "Managed in tab"
-msgstr "在第「-1」格 (即不顯示)"
+msgstr "在第幾格顯示："
 
+# FIXME grammatical mistake in original
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/marc_subfields_structure.tmpl:17
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/marctagstructure.tmpl:17
 msgid ""
@@ -11196,18 +11077,17 @@ msgid ""
 msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:106
-#, fuzzy
 msgid "Managed,"
-msgstr "必備"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl:99
 msgid "Manages thesaurus and authorities files."
 msgstr "同義字典及權威檔案的管理"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:72
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:143
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:72
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:137
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:72
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:142
 msgid "Mandatory"
 msgstr "必備"
 
@@ -11218,21 +11098,17 @@ msgid ""
 "cataloger can't validate the biblio if the subfield is empty."
 msgstr ""
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:132
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:107
-#, fuzzy
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:132
 msgid "Mandatory,"
-msgstr "必備"
+msgstr "必備、"
 
-#  NOTE 譯文更動 by Arthur
-#  NOTE This is the correct translation in this context
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128b.tmpl:378
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128b.tmpl:380
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128c.tmpl:378
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128c.tmpl:380
-#, fuzzy
 msgid "Mandoline"
-msgstr "網上"
+msgstr ""
 
 #  XXX 暫譯，譯文有待改進
 #: ../../koha-tmpl/intranet-tmpl/default/en/mancredit.tmpl:3
@@ -11252,9 +11128,8 @@ msgstr "人手建立發票"
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1146
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1298
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1300
-#, fuzzy
 msgid "Manuel"
-msgstr "取消"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_110.tmpl:304
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_110.tmpl:306
@@ -11277,7 +11152,7 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:77
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:80
 msgid "Manuelle et par releve"
-msgstr ""
+msgstr "手繪及繪圖儀輔助繪製（如使用立體圖繪製，有時並連接電腦；用人工繪製之地圖或上墨等）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:449
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:452
@@ -11290,16 +11165,15 @@ msgstr ""
 msgid "Manuels d'enseignement programme"
 msgstr ""
 
-#  XXX 暫譯，譯文有待改進
+# XXX
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_106.tmpl:50
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_106.tmpl:52
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:235
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:237
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:283
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:285
-#, fuzzy
 msgid "Manuscrit"
-msgstr "人手記入讀者貸方"
+msgstr "手製（手繪、含特製品如石刻、模型等）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_124b.tmpl:38
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_124b.tmpl:40
@@ -11307,9 +11181,8 @@ msgid "Maquette"
 msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:110
-#, fuzzy
 msgid "Mar"
-msgstr "先生"
+msgstr "三月"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:299
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:301
@@ -11317,26 +11190,25 @@ msgstr "先生"
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:475
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:646
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:648
-#, fuzzy
 msgid "Marbre"
-msgstr "男"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:183
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:185
 msgid "Marches"
 msgstr "進行曲"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:77
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:58
 msgid "Marco Gaiarin"
 msgstr "Marco Gaiarin"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:41
 msgid "Margin Bottom (Expressed in mm)"
-msgstr ""
+msgstr "頁面下面邊界（公厘 / 毫米）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:44
 msgid "Margin Left (Expressed in mm)"
-msgstr ""
+msgstr "頁面左面邊界（公厘 / 毫米）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128b.tmpl:148
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128b.tmpl:150
@@ -11419,7 +11291,7 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:137
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:139
 msgid "Materiaux synthetiques"
-msgstr ""
+msgstr "合成物（如塑膠板、合成皮等）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:186
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:188
@@ -11454,14 +11326,13 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:861
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:945
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:947
-#, fuzzy
 msgid "Materiel d'enseignement"
-msgstr "登記日期"
+msgstr "教學資料"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:48
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:50
 msgid "Matrice (negatif)"
-msgstr ""
+msgstr "壓模版 (stamper, negative)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1417
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1419
@@ -11469,24 +11340,22 @@ msgid "Maximes, aphorismes, proverbes, anecdotes"
 msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:112
-#, fuzzy
 msgid "May"
-msgstr "繳交"
+msgstr "五月"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:208
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:210
 msgid "Mazurkas"
 msgstr ""
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:78
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:59
 msgid "Md. Aftabuddin"
 msgstr "Md. Aftabuddin"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:108
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:110
-#, fuzzy
 msgid "Medailles"
-msgstr "男"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:468
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:470
@@ -11495,14 +11364,13 @@ msgstr "男"
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:867
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:869
 msgid "Melange de techniques"
-msgstr ""
+msgstr "多種技法組合 (mixed)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:972
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1412
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1414
-#, fuzzy
 msgid "Melanges"
-msgstr "訊息"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl:6
 #: ../../koha-tmpl/intranet-tmpl/default/en/request.tmpl:81
@@ -11510,9 +11378,8 @@ msgid "Member"
 msgstr "讀者"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/members/moremember.tmpl:2
-#, fuzzy
 msgid "Member Information Screen"
-msgstr "讀者資料"
+msgstr "讀者資料畫面"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/request.tmpl:24
 msgid "Member Number"
@@ -11524,8 +11391,13 @@ msgstr "讀者號碼"
 msgid "Member Number: %s"
 msgstr "讀者號碼：%s"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/member-quicksearch.tmpl:3
+msgid "Member Quick Search"
+msgstr "快速讀者搜尋"
+
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/member.tmpl:3
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:6
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/member-quicksearch-results.tmpl:4
 msgid "Member Search"
 msgstr "讀者搜尋"
 
@@ -11533,6 +11405,10 @@ msgstr "讀者搜尋"
 msgid "Member home"
 msgstr "讀者主頁"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/member-quicksearch.tmpl:7
+msgid "Member name:"
+msgstr "讀者姓名："
+
 #. %1$s: TMPL_VAR name=member
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/imemberentry.tmpl:23
 #, c-format
@@ -11550,16 +11426,16 @@ msgstr "讀者號碼 %s，借書證號碼* %S"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-bottom.inc:7
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/about-bottom.inc:7
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/auth-search-bottom.inc:7
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/auth-bottom.inc:7
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/circulation-bottom.inc:7
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/bull-bottom.inc:7
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/cat-bottom.inc:7
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/parameters-bottom.inc:7
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/error-bottom.inc:7
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/issues-bottom.inc:7
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/members-bottom.inc:7
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/reports-bottom.inc:7
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/auth-bottom.inc:7
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/auth-search-bottom.inc:7
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/bull-bottom.inc:7
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/error-bottom.inc:7
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:3
 #: ../../koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl:97
 #: ../../koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl:143
@@ -11598,10 +11474,10 @@ msgstr "讀者號碼"
 msgid "Membership Number: %s"
 msgstr "讀者號碼：%s"
 
+# TODO check
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:6
-#, fuzzy
 msgid "Membership record"
-msgstr "讀者類別"
+msgstr "讀者資料紀錄"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:467
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:469
@@ -11618,9 +11494,8 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_125b.tmpl:75
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1437
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1439
-#, fuzzy
 msgid "Memoires"
-msgstr "讀者"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/newbasket2.tmpl:57
 msgid "Mending"
@@ -11628,25 +11503,21 @@ msgstr "修補中"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_110.tmpl:91
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_110.tmpl:93
-#, fuzzy
 msgid "Mensuel"
-msgstr "結果"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:178
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:180
-#, fuzzy
 msgid "Menuets"
-msgstr "預約"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:775
-#, fuzzy
 msgid "Meridien de reference 1:"
-msgstr "使用者偏好"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:1050
-#, fuzzy
 msgid "Meridien de reference 2:"
-msgstr "使用者偏好"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/branchtransfers.tmpl:79
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:19
@@ -11656,10 +11527,10 @@ msgstr "訊息"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:188
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:190
-#, fuzzy
 msgid "Messes"
-msgstr "訊息"
+msgstr ""
 
+#  NOTE 126 金屬（如，鋁等）
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:1212
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:1214
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:171
@@ -11674,9 +11545,8 @@ msgstr "訊息"
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:134
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:109
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:111
-#, fuzzy
 msgid "Metal"
-msgstr "男"
+msgstr "金屬"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:329
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:331
@@ -11690,7 +11560,7 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:124
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:126
 msgid "Metal et plastique"
-msgstr ""
+msgstr "金屬及塑膠（雷射唱片）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:1219
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:1221
@@ -11702,19 +11572,17 @@ msgstr ""
 msgid "Meteorologique"
 msgstr ""
 
-#  NOTE 譯文更動 by Arthur
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:244
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:246
-#, fuzzy
 msgid "Metres"
-msgstr "集叢"
+msgstr "公尺（米）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:920
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:922
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:1195
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:1197
 msgid "Mexico (Mexique)"
-msgstr ""
+msgstr "墨西哥城（墨西哥）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128b.tmpl:308
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128b.tmpl:310
@@ -11735,18 +11603,14 @@ msgstr ""
 msgid "Mezzotinte"
 msgstr ""
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:79
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:60
 msgid "Michaes Herman"
 msgstr "Michaes Herman"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:82
-msgid "Michel Lerenard (Esiee School)"
-msgstr "Michel Lerenard (ESIEE學院)"
-
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:48
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:50
 msgid "Micro opaque"
-msgstr ""
+msgstr "不透明微縮片 (micro opaque)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_106.tmpl:44
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_106.tmpl:46
@@ -11756,55 +11620,54 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:38
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:40
 msgid "Microfiche"
-msgstr ""
+msgstr "微縮單片 (microfiche)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:43
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:45
 msgid "Microfiche en cassette"
-msgstr ""
+msgstr "卡式微縮單片 (microfiche cassette)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:33
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:35
 msgid "Microfilm en bobine"
-msgstr ""
+msgstr "盤式微縮捲片 (microform reel)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:23
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:25
 msgid "Microfilm en cartouche"
-msgstr ""
+msgstr "匣式微縮捲片 (microform cartridge)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:28
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:30
 msgid "Microfilm en cassette"
-msgstr ""
+msgstr "卡式微縮捲片 (microform cassette)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:250
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:252
 msgid "Microphotographie"
-msgstr ""
+msgstr "縮影照相製版"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:221
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:223
 msgid "Microsillon/fin"
-msgstr ""
+msgstr "微紋"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:40
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:27
 msgid "Mike Hansen"
 msgstr "Mike Hansen"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:83
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:61
 msgid "Mike Johnson"
 msgstr "Mike Johnson"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:84
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:62
 msgid "Mike Mylonas"
 msgstr "Mike Mylonas"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:631
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:633
-#, fuzzy
 msgid "Miller"
-msgstr "男"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:46
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:48
@@ -11830,9 +11693,8 @@ msgid "Minutes (completer avec des 0):"
 msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_127.tmpl:13
-#, fuzzy
 msgid "Minutes:"
-msgstr "印表機"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl:72
 msgid "Miss"
@@ -11840,10 +11702,9 @@ msgstr "小姐"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl:52
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl:54
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:167
-#, fuzzy
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:170
 msgid "Missing"
-msgstr "小姐"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/statecollection.tmpl:9
 msgid ""
@@ -11852,11 +11713,9 @@ msgid ""
 "left box)"
 msgstr ""
 
-# XXX
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl:80
-#, fuzzy
 msgid "Missing issues"
-msgstr "現有圖書資料"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/statecollection.tmpl:17
 msgid ""
@@ -11871,9 +11730,8 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128b.tmpl:65
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128c.tmpl:63
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128c.tmpl:65
-#, fuzzy
 msgid "Mixtes"
-msgstr "測試"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:84
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:86
@@ -11882,7 +11740,7 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:226
 msgid "Mode de realisation technique:"
-msgstr ""
+msgstr "製圖技術："
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:162
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:164
@@ -11894,11 +11752,10 @@ msgstr ""
 msgid "Modeles reduit"
 msgstr ""
 
-#. INPUT type=submit
+#: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:114
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:75
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:80
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl:37
-#: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:114
 msgid "Modify"
 msgstr "修改"
 
@@ -11909,7 +11766,6 @@ msgid "Modify Group - %s"
 msgstr "修改群組 - %s"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem.tmpl:35
-#, fuzzy
 msgid "Modify Item"
 msgstr "修改圖書資料"
 
@@ -11935,16 +11791,15 @@ msgid "Modify authorised value"
 msgstr "修改容許值"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:60
-#, fuzzy
 msgid "Modify authority type"
-msgstr "修改圖書資料類別"
+msgstr "修改權威類別"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:120
 msgid "Modify book fund"
 msgstr "修改書籍採購資金"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:63
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:64
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:63
 msgid "Modify category"
 msgstr "修改類別"
 
@@ -11977,17 +11832,16 @@ msgid "Modify printer"
 msgstr "修改印表機"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:157
-#, fuzzy
 msgid "Modify shelf"
-msgstr "修改圖書資料"
+msgstr "修改虛擬書架"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:5
 #, fuzzy
 msgid "Modify subscription"
 msgstr "修改網站連結"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:61
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:61
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:61
 msgid "Modify tag"
 msgstr "修改欄"
 
@@ -12010,30 +11864,27 @@ msgstr "小姐"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:637
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:639
-#, fuzzy
 msgid "Mollweide"
-msgstr "批准"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:416
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:418
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:180
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:182
 msgid "Monaural"
-msgstr ""
+msgstr "單聲道"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:48
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:94
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:96
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:58
-#, fuzzy
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:61
 msgid "Monday"
-msgstr "修改"
+msgstr "星期一"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:102
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:104
-#, fuzzy
 msgid "Monnaies"
-msgstr "包含"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:753
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:755
@@ -12041,16 +11892,13 @@ msgstr "包含"
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:20
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:224
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:226
-#, fuzzy
 msgid "Monochrome"
-msgstr "電話 (住宅)"
+msgstr "單色 (monochrome)"
 
-# NOTE Cf http://dimes.lins.fju.edu.tw/pub/bulletin-lac-60/dc-cmark.htm
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:41
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:44
-#, fuzzy
 msgid "Monographie complete"
-msgstr "完整專論"
+msgstr "一次或一年內出版完整之單行本"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:1026
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:1028
@@ -12061,17 +11909,14 @@ msgstr "完整專論"
 msgid "Monotype"
 msgstr ""
 
-# FIXME looks like a BUG in the English template
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:107
-#, fuzzy
 msgid "Month"
-msgstr "個月%0.0s"
+msgstr "月"
 
-# XXX what is this?!
+# XXX
 #: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl:102
-#, fuzzy
 msgid "More fields"
-msgstr "圖書資料相關欄位"
+msgstr "更多欄位"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:162
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:164
@@ -12089,16 +11934,12 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:1201
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:1203
 msgid "Moscou (Russie)"
-msgstr ""
+msgstr "莫斯科（俄國）"
 
-#  NOTE 圖書資料的Notes (MARC21欄500) 中文稱「附註項」，不譯「備註」
-#  NOTE 見http://ceiba3.cc.ntu.edu.tw/course/8f0440/catalog2.htm
-#  FIXME 問題來了，不是圖書資料的Notes，譯「附註」有些奇怪，但兩種Notes分不開:-(
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:193
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:195
-#, fuzzy
 msgid "Motets"
-msgstr "附註/備註"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl:75
 msgid "Mr"
@@ -12117,9 +11958,8 @@ msgstr "女士"
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:133
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:226
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:228
-#, fuzzy
 msgid "Muet"
-msgstr "預算案"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:429
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:431
@@ -12131,7 +11971,7 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:763
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:765
 msgid "Multicolore"
-msgstr ""
+msgstr "彩色"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_106.tmpl:56
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_106.tmpl:58
@@ -12143,7 +11983,7 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:1207
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:1209
 msgid "Munich (Allemagne)"
-msgstr ""
+msgstr "慕尼黑（德國）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:78
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:80
@@ -12200,14 +12040,14 @@ msgstr ""
 msgid "My Settings"
 msgstr "我的設定"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:21
-msgid "MySQL version:"
-msgstr "MySQL版本："
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:11
+msgid "MySQL version"
+msgstr "MySQL 版本"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:260
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:263
 msgid "N'est pas le produit final"
-msgstr ""
+msgstr "尚未至最後使用之製圖技術"
 
 #. INPUT type=submit name=NEW
 #: ../../koha-tmpl/intranet-tmpl/default/en/thesaurus_popup.tmpl:36
@@ -12221,13 +12061,17 @@ msgid "NEW MEMBER"
 msgstr "新增讀者"
 
 #. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:40
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:94
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:159
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl:166
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:226
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:76
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:40
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:106
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/biblio_framework.tmpl:98
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:83
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:255
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:215
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:226
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/currency.tmpl:135
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl:121
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:89
@@ -12237,18 +12081,13 @@ msgstr "新增讀者"
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl:124
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl:92
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl:180
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:76
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:93
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:106
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/biblio_framework.tmpl:98
 msgid "NO"
 msgstr "否"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_124f.tmpl:28
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_124f.tmpl:30
-#, fuzzy
 msgid "NOAA"
-msgstr "否"
+msgstr ""
 
 #  NOTE 譯文更動 by Arthur
 #  NOTE 譯文更動 by Ambrose
@@ -12274,10 +12113,11 @@ msgid "NOTES"
 msgstr "備註"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/koha2marclinks.tmpl:158
-#, fuzzy
 msgid "NOTES :"
-msgstr "備註"
+msgstr "備註："
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:86
+#: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:159
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/newimember.tmpl:18
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/newimember.tmpl:126
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/newjmember.tmpl:27
@@ -12292,8 +12132,6 @@ msgstr "備註"
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:233
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/printers.tmpl:167
 #: ../../koha-tmpl/intranet-tmpl/default/en/stats.tmpl:5
-#: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:86
-#: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:159
 msgid "Name"
 msgstr "名稱"
 
@@ -12303,9 +12141,8 @@ msgid "Name of this import:"
 msgstr "這次匯入的名稱："
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-bib-search.tmpl:13
-#, fuzzy
 msgid "Name or ISSN"
-msgstr "名稱：%S"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/AcceptMarcUpload.tmpl:27
 #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/uploadmarc.tmpl:27
@@ -12332,26 +12169,27 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:79
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:81
 msgid "Negatif"
-msgstr ""
+msgstr "負片 (negative)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:40
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:42
 msgid "Negatif photo"
-msgstr ""
+msgstr "負片 (photonegative)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:201
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:204
 msgid "Negatif sur base flexible"
-msgstr ""
+msgstr "透明或不透明彈性負片基底"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:213
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:216
 msgid "Negatif sur base rigide"
-msgstr ""
+msgstr "透明或不透明非彈性負片基底"
 
+# FIXME need to fix the template
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl:4
 msgid "New"
-msgstr ""
+msgstr "新"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/maninvoice.tmpl:13
 msgid "New Card"
@@ -12375,9 +12213,8 @@ msgid "New Record"
 msgstr "新增記錄"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/newbasket2.tmpl:12
-#, fuzzy
 msgid "New Search:"
-msgstr "查詢"
+msgstr "新查詢："
 
 #  NOTE 譯文更動 by Arthur
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/member-password.tmpl:11
@@ -12389,10 +12226,10 @@ msgstr "新的使用者ID："
 msgid "New category..."
 msgstr "新增類別..."
 
+# XXX
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl:75
-#, fuzzy
 msgid "New order"
-msgstr "新增記錄"
+msgstr "開新訂單"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/newbasket2.tmpl:88
 msgid "Next"
@@ -12422,17 +12259,16 @@ msgstr "下一筆"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/result.tmpl:10
 #: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/result.tmpl:65
-#, fuzzy
 msgid "Next&gt;&gt;"
 msgstr "下一頁 &gt;&gt;"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:39
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:26
 msgid "Nicholas Rosasco, (Documentation Compiler)"
 msgstr "Nicholas Rosasco (說明書編輯)"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:42
-msgid "Nicolas Morin, French Translation"
-msgstr "Nicolas Morin (法文翻譯)"
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:63
+msgid "Nicolas Morin (French Translation in 2.0)"
+msgstr "Nicolas Morin (2.0版之法文翻譯)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_124f.tmpl:33
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_124f.tmpl:35
@@ -12441,9 +12277,8 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:354
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:356
-#, fuzzy
 msgid "Nitrate"
-msgstr "繪圖"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:560
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:562
@@ -12480,6 +12315,7 @@ msgstr ""
 msgid "Nitrate, poudre"
 msgstr ""
 
+#  TODO
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:334
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:336
 msgid "Niveau indetermine"
@@ -12487,25 +12323,25 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:117
 msgid "Niveau intellectuel ou public destinataire 1"
-msgstr ""
+msgstr "適用對象（一）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:171
 msgid "Niveau intellectuel ou public destinataire 2"
-msgstr ""
+msgstr "適用對象（二）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:225
 msgid "Niveau intellectuel ou public destinataire 3"
-msgstr ""
+msgstr "適用對象（三）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:135
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:152
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:153
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:126
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:192
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:276
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:273
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl:145
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:146
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:147
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:151
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:152
 msgid "No"
 msgstr "否"
 
@@ -12533,7 +12369,6 @@ msgid "No debts"
 msgstr "無欠款"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:53
-#, fuzzy
 msgid "No guarantor"
 msgstr "無擔保人"
 
@@ -12543,7 +12378,7 @@ msgstr "找不到圖書資料"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:174
 msgid "No more renewals possible"
-msgstr ""
+msgstr "無法再次續借"
 
 #. %1$s: TMPL_VAR name=id
 #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/ListFileRecords.tmpl:38
@@ -12551,28 +12386,22 @@ msgstr ""
 msgid "No results found for query %s"
 msgstr "沒有結果乎合查詢 %s"
 
-#  NOTE 譯文更動 by Arthur
 #: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/result.tmpl:11
-#, fuzzy
 msgid "No results found."
-msgstr "找到 %s 個結果。"
+msgstr "沒有結果乎合查詢。"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl:34
 msgid "No suggestions waiting"
-msgstr ""
+msgstr "沒有未處理的新書建議"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bookcount.tmpl:21
 msgid "No. of Issues"
 msgstr "借出次數"
 
-#  NOTE 圖書資料的Notes (MARC21欄500) 中文稱「附註項」，不譯「備註」
-#  NOTE 見http://ceiba3.cc.ntu.edu.tw/course/8f0440/catalog2.htm
-#  FIXME 問題來了，不是圖書資料的Notes，譯「附註」有些奇怪，但兩種Notes分不開:-(
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:213
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:215
-#, fuzzy
 msgid "Nocturnes"
-msgstr "附註/備註"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:58
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:60
@@ -12581,7 +12410,7 @@ msgstr "附註/備註"
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:758
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:760
 msgid "Noir et blanc"
-msgstr ""
+msgstr "黑白"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_124f.tmpl:9
 msgid "Nom du satellite pour la teledetection:"
@@ -12653,9 +12482,8 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:282
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:352
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:354
-#, fuzzy
 msgid "Non applicable"
-msgstr "(如適用)"
+msgstr "不適用"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_125a.tmpl:58
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_125a.tmpl:60
@@ -12665,7 +12493,7 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:434
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:436
 msgid "Non enregistre sur bande"
-msgstr ""
+msgstr "非錄音帶錄音"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128b.tmpl:448
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128b.tmpl:450
@@ -12777,9 +12605,8 @@ msgstr "非小說類"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:46
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:48
-#, fuzzy
 msgid "Non-applicable"
-msgstr "(如適用)"
+msgstr "不適用"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:604
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:606
@@ -12796,6 +12623,7 @@ msgstr ""
 msgid "Non-nitrate, deterioration avancee"
 msgstr ""
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:92
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:153
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:202
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:17
@@ -13144,7 +12972,6 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_141.tmpl:292
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_141.tmpl:334
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_141.tmpl:336
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:92
 msgid "None"
 msgstr "無"
 
@@ -13156,14 +12983,13 @@ msgstr "無"
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_123f.tmpl:30
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_123g.tmpl:28
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_123g.tmpl:30
-#, fuzzy
 msgid "Nord"
-msgstr "字詞"
+msgstr "北"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:176
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:178
 msgid "Normale (16x - 30x)"
-msgstr ""
+msgstr "正常縮率（16–30倍）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_110.tmpl:209
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_110.tmpl:211
@@ -13179,16 +13005,18 @@ msgid ""
 "\"stopwords\" list defines these unnecessary words for your installation."
 msgstr ""
 
+#  NOTE 暫譯，CMARC 無此分欄
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:1012
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:1014
 msgid "Norme CCIR/IEC"
-msgstr ""
+msgstr "CCIR/IEC 標準"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:407
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:410
 msgid "Norme ISO pour la translitteration"
-msgstr ""
+msgstr "國際標準組織音譯法"
 
+#  NOTE 暫譯，CMARC 無此分欄
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:1007
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:1009
 msgid "Norme NAB"
@@ -13218,33 +13046,31 @@ msgstr "不可"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:184
 msgid "Not an issue but a renewal"
-msgstr ""
+msgstr "乃續借而非新借出"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl:80
 msgid "Not for loan"
 msgstr "不可借出"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:132
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:107
-#, fuzzy
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:132
 msgid "Not mandatory,"
-msgstr "必備"
+msgstr "自由使用、"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl:202
 msgid "Not on Issue."
 msgstr "沒有借出。"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:131
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:106
-#, fuzzy
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:131
 msgid "Not repeatable,"
-msgstr "可重覆"
+msgstr "不可重覆、"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/issuingrules.tmpl:11
 msgid ""
 "Note : fines are calculated by the fines2.pl script, located in misc "
 "directory."
-msgstr ""
+msgstr "注意：罰款係由位於 misc 目錄內的 fines2.pl 計算。"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/export/marc.tmpl:14
 msgid "Note : the items are NOT exported by this tool"
@@ -13269,8 +13095,8 @@ msgid ""
 msgstr ""
 
 #  NOTE 譯文更動 by Arthur
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:54
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:50
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:54
 msgid "Note: in the last column, you can choose:"
 msgstr "注意：在最後一欄，您可以選擇："
 
@@ -13280,6 +13106,7 @@ msgstr "注意：在最後一欄，您可以選擇："
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl:80
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl:177
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl:65
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:20
 #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/AcceptBiblioitem.tmpl:50
 #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl:26
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/imemberentry.tmpl:87
@@ -13289,11 +13116,10 @@ msgstr "注意：在最後一欄，您可以選擇："
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl:230
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/newimember.tmpl:150
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/newmember.tmpl:202
-#: ../../koha-tmpl/intranet-tmpl/default/en/modbibitem.tmpl:51
 #: ../../koha-tmpl/intranet-tmpl/default/en/modbib.tmpl:46
+#: ../../koha-tmpl/intranet-tmpl/default/en/modbibitem.tmpl:51
 #: ../../koha-tmpl/intranet-tmpl/default/en/request.tmpl:25
 #: ../../koha-tmpl/intranet-tmpl/default/en/request.tmpl:82
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:20
 msgid "Notes"
 msgstr "附註/備註"
 
@@ -13305,7 +13131,7 @@ msgstr "附註/備註"
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem-nomarc.tmpl:36
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem-nomarc.tmpl:56
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem-nomarc.tmpl:97
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:16
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:19
 msgid "Notes:"
 msgstr "附註："
 
@@ -13325,7 +13151,7 @@ msgstr "找不到您需用的資料"
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:373
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:375
 msgid "Notice non modifiee"
-msgstr ""
+msgstr "未修正"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/user/userpage.tmpl:55
 msgid "Notify me about Special Events by email"
@@ -13346,9 +13172,8 @@ msgid "Nouvelles"
 msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:118
-#, fuzzy
 msgid "Nov"
-msgstr "否"
+msgstr "十一月"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/branches.tmpl:9
 msgid ""
@@ -13371,30 +13196,27 @@ msgid "Number"
 msgstr "集叢編次"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:134
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:81
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:84
 msgid "Number of issues"
 msgstr "期數"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:136
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:83
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-renew.tmpl:14
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:86
 msgid "Number of months"
 msgstr ""
 
-#  NOTE MARC21 的 440$n, "Number of part/section of a work (R)", 例如 "Part C"、"Series 1" 等
-#  NOTE 看來是對應 CMARC 的 225$h,「集叢編次」
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-renew.tmpl:12
-#, fuzzy
 msgid "Number of num"
-msgstr "集叢編次"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl:89
 msgid "Number of renewals allowed"
 msgstr "可續借次數"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:135
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:82
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-renew.tmpl:13
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:85
 msgid "Number of weeks"
 msgstr ""
 
@@ -13402,15 +13224,12 @@ msgstr ""
 msgid "Number:"
 msgstr "集叢編次："
 
-#  NOTE MARC21 的 440$n, "Number of part/section of a work (R)", 例如 "Part C"、"Series 1" 等
-#  NOTE 看來是對應 CMARC 的 225$h,「集叢編次」
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl:18
-#, fuzzy
 msgid "Numbered"
-msgstr "集叢編次"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:140
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:87
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:90
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:10
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-detail.tmpl:11
 msgid "Numbering calculation"
@@ -13423,20 +13242,22 @@ msgid "Numbering formula: %S"
 msgstr ""
 
 #. %1$s: TMPL_VAR name=numberingmethod
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:89
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:92
 #, c-format
 msgid "Numbering formula: %s"
 msgstr ""
 
+#  NOTE 暫譯，CMARC 無此分欄
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:981
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:983
 msgid "Numerique"
 msgstr "數碼"
 
+#  NOTE 暫譯，CMARC 無此分欄
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:1022
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:1024
 msgid "Numerique (disque compact)"
-msgstr ""
+msgstr "數碼（雷射唱片）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:26
 msgid ""
@@ -13457,6 +13278,7 @@ msgstr "過期/借出"
 #. INPUT type=submit
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl:9
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl:190
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/search-supply.tmpl:8
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:29
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:56
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl:24
@@ -13465,8 +13287,11 @@ msgstr "過期/借出"
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/member.tmpl:9
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl:9
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/newimember.tmpl:175
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:19
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:49
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/member-quicksearch.tmpl:7
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:74
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:101
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:116
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:134
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:141
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:149
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:166
@@ -13474,16 +13299,21 @@ msgstr "過期/借出"
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl:128
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl:136
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl:174
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:146
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:155
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:216
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:235
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:49
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:19
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:49
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:85
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/biblio_framework.tmpl:77
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:241
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:140
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:151
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:205
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:224
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:246
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:146
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:155
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:216
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:235
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:19
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:33
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:45
@@ -13492,6 +13322,12 @@ msgstr "過期/借出"
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:85
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:99
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:114
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/currency.tmpl:83
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/currency.tmpl:91
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/currency.tmpl:120
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/currency.tmpl:146
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl:97
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl:115
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/koha2marclinks.tmpl:17
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/koha2marclinks.tmpl:30
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/koha2marclinks.tmpl:43
@@ -13503,12 +13339,6 @@ msgstr "過期/借出"
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/koha2marclinks.tmpl:121
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/koha2marclinks.tmpl:134
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/koha2marclinks.tmpl:164
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/currency.tmpl:83
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/currency.tmpl:91
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/currency.tmpl:120
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/currency.tmpl:146
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl:97
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl:115
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:53
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:99
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:74
@@ -13531,21 +13361,11 @@ msgstr "過期/借出"
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl:133
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl:188
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl:196
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:49
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:74
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:100
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:115
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:133
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:85
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/biblio_framework.tmpl:77
 #: ../../koha-tmpl/intranet-tmpl/default/en/reports/inventory.tmpl:21
-#: ../../koha-tmpl/intranet-tmpl/default/en/reports/issues_by_borrower_category.tmpl:44
 #: ../../koha-tmpl/intranet-tmpl/default/en/reports/itemtypes.tmpl:26
+#: ../../koha-tmpl/intranet-tmpl/default/en/reports/issues_by_borrower_category.tmpl:44
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:648
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:1156
-#: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_225a.tmpl:9
-#: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_60X.tmpl:26
-#: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_700-4.tmpl:19
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_106.tmpl:77
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_110.tmpl:658
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:1305
@@ -13580,10 +13400,12 @@ msgstr "過期/借出"
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_135a.tmpl:53
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1701
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_141.tmpl:374
+#: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_225a.tmpl:9
+#: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_60X.tmpl:26
+#: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_700-4.tmpl:19
 #: ../../koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl:101
 #: ../../koha-tmpl/intranet-tmpl/default/en/thesaurus_popup.tmpl:9
 #: ../../koha-tmpl/intranet-tmpl/default/en/thesaurus_popup.tmpl:27
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/search-supply.tmpl:8
 msgid "OK"
 msgstr "好！"
 
@@ -13596,9 +13418,9 @@ msgstr "或新增至新群組："
 msgid "ORDERING INFORMATION"
 msgstr "訂單資料"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:13
-msgid "OS version (from 'uname -a'):"
-msgstr "作業系統版本<br>(經由 uname -a 取得)："
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:9
+msgid "OS version ('uname -a')"
+msgstr "作業系統版本<br>(經由「uname -a」取得)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:680
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:683
@@ -13608,12 +13430,12 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:43
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:45
 msgid "Oblique faible"
-msgstr ""
+msgstr "低傾斜"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:48
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:50
 msgid "Oblique forte"
-msgstr ""
+msgstr "高傾斜"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_124e.tmpl:28
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_124e.tmpl:30
@@ -13622,9 +13444,8 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:117
 msgid "Oct"
-msgstr ""
+msgstr "十月"
 
-#  NOTE 譯文更動 by Arthur
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:826
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:828
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:980
@@ -13633,9 +13454,8 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1136
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1288
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1290
-#, fuzzy
 msgid "Oeuvre de commemoration"
-msgstr "已還圖書資料"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:821
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:823
@@ -13673,9 +13493,9 @@ msgstr "借出"
 
 #. %1$s: TMPL_VAR name=date_due
 #: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/result.tmpl:43
-#, fuzzy, c-format
+#, c-format
 msgid "On Loan until %s"
-msgstr "借出"
+msgstr "借出直至 %s"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:189
 msgid "On Request - no renewals"
@@ -13683,9 +13503,9 @@ msgstr "已被預約，無法續借"
 
 #. %1$s: TMPL_VAR name=cardnumber
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl:52
-#, fuzzy, c-format
+#, c-format
 msgid "On issue to <a1>%s</a>"
-msgstr "圖書資料：%s (%s) <a1>%s</a>"
+msgstr "借出至 <a1>%s</a>"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/members/moremember.tmpl:4
 msgid "On the top left is their address and card number."
@@ -13738,16 +13558,6 @@ msgstr "每行一個著者"
 msgid "One Subject per line"
 msgstr "每行一個主題"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/errors/400.tmpl:4
-#: ../../koha-tmpl/intranet-tmpl/default/en/errors/401.tmpl:4
-#: ../../koha-tmpl/intranet-tmpl/default/en/errors/402.tmpl:4
-#: ../../koha-tmpl/intranet-tmpl/default/en/errors/403.tmpl:4
-#: ../../koha-tmpl/intranet-tmpl/default/en/errors/404.tmpl:4
-#: ../../koha-tmpl/intranet-tmpl/default/en/errors/405.tmpl:4
-#: ../../koha-tmpl/intranet-tmpl/default/en/errors/500.tmpl:4
-msgid "One error happens !!"
-msgstr ""
-
 #  NOTE 譯文更動 by Arthur
 #  NOTE This is the correct translation in this context
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/detail-opac.tmpl:59
@@ -13755,12 +13565,9 @@ msgstr ""
 msgid "Online"
 msgstr "網上"
 
-#  NOTE 譯文更動 by Arthur
-#  NOTE This is the correct translation in this context
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/nohelp.tmpl:2
-#, fuzzy
 msgid "Online Help"
-msgstr "網上"
+msgstr "線上說明"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl:82
 #, fuzzy
@@ -13768,9 +13575,8 @@ msgid "Opac's note"
 msgstr "前言、註釋"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl:66
-#, fuzzy
 msgid "Open Source Library System"
-msgstr "Koha：開放原始碼的圖書館管理系統"
+msgstr "開放原始碼的圖書館管理系統"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:218
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:220
@@ -13779,9 +13585,8 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:223
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:225
-#, fuzzy
 msgid "Oratorios"
-msgstr "類別"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128b.tmpl:98
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128b.tmpl:100
@@ -13831,12 +13636,11 @@ msgid "Order placed: %s"
 msgstr "訂單日期：%s"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/histsearch.tmpl:3
-#, fuzzy
 msgid "Order search"
-msgstr "開始查詢"
+msgstr "尋找訂單"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl:138
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/search.tmpl:28
+#: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl:138
 msgid "Ordered by"
 msgstr "排序"
 
@@ -13844,9 +13648,8 @@ msgstr "排序"
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128b.tmpl:240
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128c.tmpl:238
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128c.tmpl:240
-#, fuzzy
 msgid "Ordinateur"
-msgstr "印表機"
+msgstr "電腦"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128b.tmpl:263
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128b.tmpl:265
@@ -13858,7 +13661,7 @@ msgstr "過期"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:34
 msgid "Orientation du capteur :"
-msgstr ""
+msgstr "感測器角度："
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:18
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:20
@@ -13896,9 +13699,8 @@ msgid "Other lib"
 msgstr "其他說明"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl:67
-#, fuzzy
 msgid "Other options"
-msgstr "其他形式"
+msgstr "其他選項"
 
 #  NOTE 譯文更動 by Arthur
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbooks.tmpl:38
@@ -13913,9 +13715,8 @@ msgstr "不然，您可以從頭開始，自已建立一個書目。"
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_123f.tmpl:20
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_123g.tmpl:18
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_123g.tmpl:20
-#, fuzzy
 msgid "Ouest"
-msgstr "測試"
+msgstr "西"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:64
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:66
@@ -13924,9 +13725,8 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:228
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:230
-#, fuzzy
 msgid "Ouvertures"
-msgstr "過期"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:761
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:763
@@ -13947,9 +13747,8 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1086
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1238
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1240
-#, fuzzy
 msgid "Ouvrage de reference"
-msgstr "設定偏好"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:831
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:833
@@ -14006,14 +13805,13 @@ msgstr ""
 msgid "Ouvrage scientifique"
 msgstr ""
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:257
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:261
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:258
 msgid "Overdue"
 msgstr "過期"
 
 #  NOTE 譯文更動 by Arthur
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/categorie.tmpl:23
-#, fuzzy
 msgid "Overdue Notice Required"
 msgstr "需要過期通知"
 
@@ -14024,9 +13822,8 @@ msgid ""
 msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/issuingrules.tmpl:14
-#, fuzzy
 msgid "Overdue charges"
-msgstr "過期圖書資料"
+msgstr "過期罰款"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/issuingrules.tmpl:6
 msgid ""
@@ -14039,10 +13836,10 @@ msgid "Overdue items"
 msgstr "過期圖書資料"
 
 #  NOTE 譯文更動 by Arthur
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:132
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:202
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:123
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:191
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:132
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:202
 msgid "Overdue notice required"
 msgstr "需要過期通知"
 
@@ -14055,21 +13852,20 @@ msgstr "管理人："
 #  NOTE 即「Post and Packaging」（北美稱「Shipping and Handling」，S&H）
 #  NOTE 字義係由Simon Blake在#koha提供
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl:37
-#, fuzzy
 msgid "P&amp;P"
 msgstr "運費"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:139
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:141
 msgid "P.V.C."
-msgstr ""
+msgstr "塑膠 (PVC)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/jmemberentry.tmpl:25
 msgid "PARENT OR GUARDIAN"
 msgstr "家長或監護人"
 
+#  FIXME need to fix the template
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl:57
-#, fuzzy
 msgid "PERSONAL"
 msgstr "個人資料"
 
@@ -14077,15 +13873,13 @@ msgstr "個人資料"
 msgid "PERSONAL DETAILS"
 msgstr "個人資料"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:137
-#, fuzzy
+#: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:134
 msgid "Page Size"
-msgstr "大小"
+msgstr "頁面大小"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:32
-#, fuzzy
 msgid "Page Type"
-msgstr "圖書資料類別"
+msgstr "紙張類型"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl:36
 #: ../../koha-tmpl/intranet-tmpl/default/en/modbibitem.tmpl:45
@@ -14121,14 +13915,13 @@ msgstr "頁數："
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_141.tmpl:105
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_141.tmpl:158
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_141.tmpl:160
-#, fuzzy
 msgid "Papier"
-msgstr "印表機"
+msgstr "紙"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:169
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:171
 msgid "Papier calque"
-msgstr ""
+msgstr "描圖紙"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1549
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1551
@@ -14162,49 +13955,47 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:51
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:88
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:90
-#, fuzzy
 msgid "Par ordinateur"
-msgstr "印表機"
+msgstr "電腦繪製（例如以電腦繪圖機繪製之地圖）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:54
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:93
 msgid "Par techique de teledetection active"
-msgstr ""
+msgstr "主動遙測繪製（a、b、c 所述技術外）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:61
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:100
 msgid "Par techique de teledetection passive"
-msgstr ""
+msgstr "被動遙測繪製（a、b、c 所述技術外）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:57
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:96
 msgid "Par technique de teledetection active"
-msgstr ""
+msgstr "主動遙測繪製（a、b、c 所述技術外）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:64
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:103
 msgid "Par technique de teledetection passive"
-msgstr ""
+msgstr "被動遙測繪製（a、b、c 所述技術外）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1387
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1389
-#, fuzzy
 msgid "Parabole"
-msgstr "變數"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:11
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-bottom.inc:11
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/about-bottom.inc:11
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/auth-search-bottom.inc:12
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/auth-bottom.inc:12
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/circulation-bottom.inc:11
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/bull-bottom.inc:11
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/cat-bottom.inc:11
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/parameters-bottom.inc:11
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/error-bottom.inc:11
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/issues-bottom.inc:11
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/members-bottom.inc:11
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/reports-bottom.inc:11
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/auth-bottom.inc:12
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/auth-search-bottom.inc:12
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/bull-bottom.inc:11
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/error-bottom.inc:11
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:4
 #: ../../koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl:127
 #: ../../koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl:149
@@ -14230,7 +14021,7 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:1226
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:1228
 msgid "Paris (France)"
-msgstr ""
+msgstr "巴黎（法國）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_125a.tmpl:79
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_125a.tmpl:81
@@ -14254,9 +14045,8 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:866
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:950
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:952
-#, fuzzy
 msgid "Partition"
-msgstr "職位"
+msgstr "樂譜"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_125a.tmpl:28
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_125a.tmpl:30
@@ -14342,12 +14132,13 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:321
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:323
 msgid "Pas de repere"
-msgstr ""
+msgstr "未平差"
 
+#  NOTE CMARC 無正式譯文
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:211
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:213
 msgid "Pas de support secondaire"
-msgstr ""
+msgstr "無外框"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:96
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:98
@@ -14376,16 +14167,14 @@ msgstr "密碼"
 msgid "Password:"
 msgstr "密碼："
 
-#  XXX 暫譯
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:372
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:374
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:571
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:573
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:771
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:773
-#, fuzzy
 msgid "Pastel"
-msgstr "私人"
+msgstr "粉彩 (pastel)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/overdue.tmpl:8
 msgid "Patron"
@@ -14397,13 +14186,12 @@ msgstr "讀者"
 msgid "Pavanes"
 msgstr "頁數"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:86
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:64
 msgid "Pawel Skuza (Polish for 1.2)"
 msgstr "Pawel Skuza (1.2版之波蘭文譯者)"
 
 #. INPUT type=submit name=submit
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/pay.tmpl:36
-#, fuzzy
 msgid "Pay"
 msgstr "繳交"
 
@@ -14422,25 +14210,24 @@ msgstr "付款"
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:159
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:161
 msgid "Peau"
-msgstr ""
+msgstr "皮革（牛皮、羊皮等）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:142
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:145
 msgid "Peau (parchemin, velin...)"
-msgstr ""
+msgstr "皮革（牛皮、羊皮等）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:28
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:30
-#, fuzzy
 msgid "Peinture"
-msgstr "印表機"
+msgstr "繪畫 (painting)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:957
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:960
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:1232
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:1235
 msgid "Pekin (RP de chine)"
-msgstr ""
+msgstr "北京（中國）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:501
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:503
@@ -14453,32 +14240,27 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_110.tmpl:19
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_110.tmpl:21
-#, fuzzy
 msgid "Periodique"
-msgstr "已停刊之期刊"
+msgstr ""
 
-# XXX See http://opac.bas-net.by/marc-doc/unimarc/concise.htm, translation uncertain
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:35
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:38
-#, fuzzy
 msgid "Periodique d'etat inconnu"
-msgstr "狀態不詳之期刊"
+msgstr "連續性出版品不能確定是否仍繼續刊行或已停刊者"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:24
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:27
-#, fuzzy
 msgid "Periodique en cours"
-msgstr "目前仍有出版之期刊"
+msgstr "繼續刊行之連續性出版品"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:30
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:32
-#, fuzzy
 msgid "Periodique mort"
-msgstr "已停刊之期刊"
+msgstr "已停刊之連續性出版品"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:17
-msgid "Perl version:"
-msgstr "Perl版本："
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:10
+msgid "Perl version"
+msgstr "Perl 版本"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:965
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:967
@@ -14553,7 +14335,7 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:293
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:295
 msgid "Photographie"
-msgstr ""
+msgstr "照像製版"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_124g.tmpl:23
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_124g.tmpl:25
@@ -14568,7 +14350,7 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:46
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:85
 msgid "Photographique"
-msgstr ""
+msgstr "照像（例如以傳統可見光譜航空照像技術所製作之地圖）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:960
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:962
@@ -14619,13 +14401,8 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:636
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:127
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:129
-#, fuzzy
 msgid "Pierre"
-msgstr "印表機"
-
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:85
-msgid "Pierre Cauchois (Esiee School)"
-msgstr "Pierre Cauchois (ESIEE學院)"
+msgstr "石頭"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:295
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:469
@@ -14671,9 +14448,8 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:657
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:855
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:857
-#, fuzzy
 msgid "Pistolet"
-msgstr "題名"
+msgstr "噴槍法 (air brush)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl:35
 #: ../../koha-tmpl/intranet-tmpl/default/en/modbibitem.tmpl:38
@@ -14718,7 +14494,7 @@ msgid "Planimetrique"
 msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:28
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:19
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:22
 msgid "Planning"
 msgstr ""
 
@@ -14755,6 +14531,7 @@ msgstr ""
 msgid "Plaques de microscopes"
 msgstr ""
 
+#  NOTE CMARC 126b 無 2h
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:365
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:367
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:539
@@ -14764,7 +14541,7 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:99
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:101
 msgid "Plastique"
-msgstr ""
+msgstr "塑膠"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:662
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:664
@@ -14781,44 +14558,40 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:612
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:179
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:181
-#, fuzzy
 msgid "Platre"
-msgstr "出版地"
+msgstr "石膏"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/selectbranchprinter.tmpl:12
-#, fuzzy
 msgid "Please Set Branch:"
-msgstr "請設定分館及印表機"
+msgstr "請設定分館："
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/selectbranchprinter.tmpl:24
-#, fuzzy
 msgid "Please Set Printer:"
-msgstr "請設定分館及印表機"
+msgstr "請設定印表機："
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio-nomarc.tmpl:10
 msgid "Please Specify a Title"
 msgstr "請輸入題名"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/newjmember.tmpl:6
-#, fuzzy
 msgid "Please enter a library card number."
-msgstr "輸入讀者的借書證號碼"
+msgstr "輸入讀者的借書證號碼。"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/newjmember.tmpl:9
 msgid "Please enter the patron's date of birth."
-msgstr ""
+msgstr "輸入讀者的出生日期。"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/newjmember.tmpl:7
 msgid "Please enter the patron's first name."
-msgstr ""
+msgstr "輸入讀者的名。"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/newjmember.tmpl:10
 msgid "Please enter the patron's gender."
-msgstr ""
+msgstr "輸入讀者的性別。"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/newjmember.tmpl:8
 msgid "Please enter the patron's last name."
-msgstr ""
+msgstr "輸入讀者的姓氏。"
 
 #. %1$s: TMPL_VAR name=msg
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/branchtransfers.tmpl:94
@@ -14835,12 +14608,12 @@ msgstr "請還給 %s"
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:389
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:391
 msgid "Pleine piste"
-msgstr ""
+msgstr "單音軌（全音跡）"
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=value_builder
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:138
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:112
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:138
 #, c-format
 msgid "Plugin :%s,"
 msgstr ""
@@ -14848,7 +14621,7 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:89
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:91
 msgid "Plusieurs polarites"
-msgstr ""
+msgstr "含正負兩極 (mixed polarity)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:318
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:320
@@ -14872,7 +14645,7 @@ msgstr "網站"
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:849
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:851
 msgid "Pointe d'argent"
-msgstr ""
+msgstr "銀筆法 (silver point)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:1014
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:1016
@@ -14880,9 +14653,8 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:1211
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:1404
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:1406
-#, fuzzy
 msgid "Pointe seche"
-msgstr "電話 (住宅)"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:144
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:146
@@ -14903,9 +14675,8 @@ msgid "Polarisee"
 msgstr "波蘭文"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:65
-#, fuzzy
 msgid "Polarite:"
-msgstr "印表機"
+msgstr "極性："
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/user/userpage.tmpl:42
 msgid "Polish"
@@ -14938,7 +14709,7 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:144
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:146
 msgid "Polyester"
-msgstr ""
+msgstr "多元脂 (polyester)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:743
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:745
@@ -14954,7 +14725,7 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:598
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:600
 msgid "Porcelaine"
-msgstr ""
+msgstr "瓷"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:311
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:313
@@ -15007,19 +14778,18 @@ msgstr "埠"
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:303
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:74
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:76
-#, fuzzy
 msgid "Positif"
-msgstr "職位"
+msgstr "正片 (positive)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:195
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:198
 msgid "Positif sur base flexible"
-msgstr ""
+msgstr "透明或不透明彈性正片基底"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:207
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:210
 msgid "Positif sur base rigide"
-msgstr ""
+msgstr "透明或不透明非彈性正片基底"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl:45
 msgid "Position"
@@ -15075,7 +14845,7 @@ msgstr "數量"
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:242
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:244
 msgid "Pre-scolaire"
-msgstr "學前"
+msgstr "學前兒童，0–5 歲"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl:64
 msgid "Prefered Name"
@@ -15092,27 +14862,26 @@ msgstr "希望在那間"
 msgid "Prelude et fugue"
 msgstr ""
 
-# XXX tentative
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:107
-#, fuzzy
 msgid "Premiere date de publication"
-msgstr "出版日期碼"
+msgstr "出版年 1"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:301
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:303
 msgid "Premiere generation (master)"
-msgstr ""
+msgstr "母片"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:425
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:9
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:9
 msgid "Presentation materielle"
-msgstr ""
+msgstr "資料特殊類型表示"
 
+#  FIXME Clash between 126a and 130!!
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:9
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:9
 msgid "Presentation materielle:"
-msgstr ""
+msgstr "唱片、錄音帶或圓型錄音筒類型 / 資料特殊類型："
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:970
 msgid "Presentation materielle: video"
@@ -15127,17 +14896,17 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:53
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:55
 msgid "Pressage de test"
-msgstr ""
+msgstr "試壓片 (test pressing)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:114
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:116
 msgid "Pressage laque"
-msgstr ""
+msgstr "假漆版唱片（大量製造者）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:119
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:121
 msgid "Pressage plastique"
-msgstr ""
+msgstr "塑膠版唱片（大量製造者）"
 
 # FIXME This may be wrong. check context.
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:260
@@ -15150,9 +14919,8 @@ msgstr "曾借出的圖書資料"
 msgid "Previous Records"
 msgstr "上一筆"
 
-#. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl:90
 #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/detail-biblio-search.tmpl:12
+#: ../../koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl:90
 msgid "Print"
 msgstr "列印"
 
@@ -15220,7 +14988,7 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:23
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:25
 msgid "Production industrielle"
-msgstr ""
+msgstr "大量製造者（商業性發行唱片多屬此）(mass produced)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_124b.tmpl:43
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_124b.tmpl:45
@@ -15264,10 +15032,10 @@ msgid "Public"
 msgstr "公共"
 
 #  NOTE「出版年」為正確譯法，見http://ceiba3.cc.ntu.edu.tw/course/8f0440/catalog2.htm
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/search.tmpl:33
 #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl:33
 #: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl:143
 #: ../../koha-tmpl/intranet-tmpl/default/en/modbibitem.tmpl:43
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/search.tmpl:33
 msgid "Publication Year"
 msgstr "出版年"
 
@@ -15276,25 +15044,21 @@ msgstr "出版年"
 msgid "Publication Year:"
 msgstr "出版年："
 
-#  NOTE「出版年」為正確譯法，見http://ceiba3.cc.ntu.edu.tw/course/8f0440/catalog2.htm
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:357
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:360
-#, fuzzy
 msgid "Publication autonome"
-msgstr "出版年"
+msgstr "單件"
 
-#  NOTE「出版年」為正確譯法，見http://ceiba3.cc.ntu.edu.tw/course/8f0440/catalog2.htm
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:279
-#, fuzzy
 msgid "Publication officielle"
-msgstr "出版年"
+msgstr "政府出版品代碼"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl:99
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/search.tmpl:34
 #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl:34
 #: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl:93
 #: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl:144
 #: ../../koha-tmpl/intranet-tmpl/default/en/modbibitem.tmpl:37
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/search.tmpl:34
 msgid "Publisher"
 msgstr "出版者"
 
@@ -15332,7 +15096,7 @@ msgstr "數量"
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:190
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:192
 msgid "Quadriphonique"
-msgstr ""
+msgstr "四聲道"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:1072
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:1074
@@ -15342,7 +15106,7 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:63
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:144
 msgid "Qualite de l'image:"
-msgstr ""
+msgstr "影像品質："
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl:142
 msgid "Quantity"
@@ -15363,7 +15127,7 @@ msgstr "訂購數量"
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:399
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:401
 msgid "Quart de piste"
-msgstr ""
+msgstr "四音軌（四分跡）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/printers.tmpl:88
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/printers.tmpl:123
@@ -15381,6 +15145,10 @@ msgstr "沒有填寫佇列名稱"
 msgid "Quotidien"
 msgstr ""
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:31
+msgid "Rachel Hamilton-Williams, General Manager (Webmistress)"
+msgstr "Rachel Hamilton-Williams (總經理兼網站管理人)"
+
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:283
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:285
 #, fuzzy
@@ -15400,12 +15168,11 @@ msgstr "顯示次序"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:208
 msgid "Rapport de reduction specifique"
-msgstr ""
+msgstr "閱讀放大倍率"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:162
-#, fuzzy
 msgid "Rapport de reduction:"
-msgstr "複製品"
+msgstr "縮率："
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:495
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:632
@@ -15442,9 +15209,9 @@ msgstr "閱讀紀錄"
 #. %1$s: TMPL_VAR name=name
 #. %2$s: TMPL_VAR name=invoice
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl:6
-#, fuzzy, c-format
+#, c-format
 msgid "Receipt Summary for <i>%s</i> Invoice <i>%s</i>"
-msgstr "收據總結：<i>%s</i>發票 <i>%s</i>"
+msgstr "<i>%s</i> 第 <i>%s</i> 號發票的收據總結"
 
 #  NOTE 譯文更動 by Arthur
 #  NOTE 譯文更動 by Ambrose
@@ -15486,11 +15253,13 @@ msgid ""
 "& librarian interface)"
 msgstr ""
 
+#  FIXME original has spelling mistake
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl:78
 #, fuzzy
 msgid "Recieved issues"
 msgstr "已收貨"
 
+#  FIXME original has spelling mistake
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/histsearch.tmpl:11
 #, fuzzy
 msgid "Recieved on"
@@ -15531,14 +15300,15 @@ msgstr "參考書"
 msgid "Registre"
 msgstr "已登記貨勞稅號碼"
 
+#  NOTE UNIMARC "field" 12 maps to CMARC "field" 10 because CMARC field 5 maps to UNIMARC fields 5-7
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:453
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:456
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:509
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:512
 msgid "Registre ISO #37 (caracteres cyrilliques de base)"
-msgstr ""
+msgstr "ISO Registration #37 (basic Cyrillic set)"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:87
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:65
 msgid "Regula Sebastiao"
 msgstr "Regula Sebastiao"
 
@@ -15553,9 +15323,8 @@ msgid "Regulier"
 msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/suggestion/acceptorreject.tmpl:19
-#, fuzzy
 msgid "Reject"
-msgstr "可重覆"
+msgstr "拒絕"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl:119
 msgid "Related"
@@ -15597,7 +15366,7 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:382
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:385
 msgid "Reliee dans une revue, une monographie"
-msgstr ""
+msgstr "刊於叢刊或書籍內"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:116
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:118
@@ -15620,8 +15389,8 @@ msgid "Remove"
 msgstr "移除"
 
 #. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/default/en/shelves.tmpl:25
 #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:30
+#: ../../koha-tmpl/intranet-tmpl/default/en/shelves.tmpl:25
 msgid "Remove Selected Items"
 msgstr "移除點選的圖書資料"
 
@@ -15660,15 +15429,6 @@ msgid ""
 "defined here)."
 msgstr ""
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:492
-#: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:578
-#: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:664
-#: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:750
-#: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:836
-#: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:922
-msgid "Renseignement techniques sur la musique"
-msgstr ""
-
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:505
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:507
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:591
@@ -15682,7 +15442,7 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:935
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:937
 msgid "Renseignements ethnologiques"
-msgstr ""
+msgstr "民族音樂資料"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:495
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:497
@@ -15697,7 +15457,7 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:925
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:927
 msgid "Renseignements historiques sur la musique"
-msgstr ""
+msgstr "音樂作品之史料"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:485
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:487
@@ -15712,16 +15472,22 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:915
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:917
 msgid "Renseignements techniques ou historiques sur les instruments"
-msgstr ""
+msgstr "樂器資料"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:490
+#: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:492
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:576
+#: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:578
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:662
+#: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:664
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:748
+#: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:750
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:834
+#: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:836
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:920
+#: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:922
 msgid "Renseignements techniques sur la musique"
-msgstr ""
+msgstr "音樂作品之技術資料"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl:93
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl:108
@@ -15733,31 +15499,31 @@ msgstr "借書費用"
 msgid "Rental charge is not a number"
 msgstr "您填寫的借書費用並非數字"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:71
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:142
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:71
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:136
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:71
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:141
 msgid "Repeatable"
 msgstr "可重覆"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:131
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:106
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:131
 msgid "Repeatable,"
 msgstr "可重覆，"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:333
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:336
 msgid "Repere avec systeme de coordonnees"
-msgstr ""
+msgstr "按座標系統平差"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:326
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:329
 msgid "Repere mais sans systeme de coordonnees"
-msgstr ""
+msgstr "未按座標系統平差"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:312
 msgid "Reperes geodesiques:"
-msgstr ""
+msgstr "大地平差法："
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:433
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:435
@@ -15805,16 +15571,16 @@ msgstr "回報"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-bottom.inc:10
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/about-bottom.inc:10
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/auth-search-bottom.inc:11
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/auth-bottom.inc:11
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/circulation-bottom.inc:10
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/bull-bottom.inc:10
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/cat-bottom.inc:10
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/parameters-bottom.inc:10
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/error-bottom.inc:10
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/issues-bottom.inc:10
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/members-bottom.inc:10
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/reports-bottom.inc:10
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/auth-bottom.inc:11
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/auth-search-bottom.inc:11
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/bull-bottom.inc:10
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/error-bottom.inc:10
 #: ../../koha-tmpl/intranet-tmpl/default/en/reports/reports-home.tmpl:4
 #: ../../koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl:119
 #: ../../koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl:147
@@ -15835,11 +15601,11 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:34
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:36
 msgid "Reproduction photomecanique"
-msgstr ""
+msgstr "照相複製品 (photomechanical reproduction)，如複製藝術品。"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/ISBDdetail.tmpl:19
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:38
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/searchresults.tmpl:74
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/ISBDdetail.tmpl:19
 #: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/result.tmpl:54
 #: ../../koha-tmpl/intranet-tmpl/default/en/request.tmpl:12
 #: ../../koha-tmpl/intranet-tmpl/default/en/request.tmpl:29
@@ -15875,8 +15641,8 @@ msgstr "預約"
 msgid "Requiem"
 msgstr "預約"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:258
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:262
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:260
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:984
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:986
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:1179
@@ -15894,10 +15660,10 @@ msgstr "已取消預約"
 msgid "Reserve Found"
 msgstr "找到預約"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:138
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:206
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:132
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:195
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:138
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:206
 msgid "Reserve fee"
 msgstr "預約手續費"
 
@@ -15913,17 +15679,17 @@ msgstr ""
 
 #. %1$s: TMPL_VAR name=RESERVED
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:190
-#, fuzzy, c-format
+#, c-format
 msgid "Reserved by %s"
-msgstr "收貨人：%s"
+msgstr "圖書資料已被 %s 預約"
 
 # XXX
 #. %1$s: TMPL_VAR name=name
 #. %2$s: TMPL_VAR name=borcnum
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/branchtransfers.tmpl:22
-#, fuzzy, c-format
+#, c-format
 msgid "Reserved: reserve found for %s (<a1>%s</a>)."
-msgstr "%s 已預約 (<a1>%s</a>)。"
+msgstr "已預約：圖書資料已被 %s (<a1>%s</a>) 預約 。"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/user/userpage.tmpl:13
 msgid "Reserves"
@@ -15954,12 +15720,12 @@ msgstr "結果"
 #. %1$s: TMPL_VAR name=from
 #. %2$s: TMPL_VAR name=to
 #. %3$s: TMPL_VAR name=total
-#: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/result.tmpl:11
-#: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_210c.tmpl:54
-#: ../../koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist-auth.tmpl:53
 #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist.tmpl:28
+#: ../../koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist-auth.tmpl:53
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/result.tmpl:24
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/searchresultlist.tmpl:24
+#: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/result.tmpl:11
+#: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_210c.tmpl:54
 #, c-format
 msgid "Results %s to %s of %s"
 msgstr "共%3$s項記錄中的第%1$s至%2$s項"
@@ -16007,8 +15773,8 @@ msgstr "在顯示第<b>%s</b>至<b>%s</b>項結果"
 msgid "Results <i>%s</i> to <i>%s</i> displayed."
 msgstr "在顯示第<b>%1$s</b>至<b>%2$s</b>項結果。"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl:132
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/search.tmpl:22
+#: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl:132
 msgid "Results per page :"
 msgstr "每頁顯示結果項數："
 
@@ -16030,9 +15796,8 @@ msgid "Return to Details Page"
 msgstr "返回細節畫面"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/readingrec.tmpl:24
-#, fuzzy
 msgid "Returned"
-msgstr "還書"
+msgstr "已還"
 
 #  NOTE 譯文更動 by Arthur
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl:132
@@ -16075,7 +15840,7 @@ msgstr "里約熱內盧（巴西）"
 msgid "Rock"
 msgstr "搖滾樂"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:88
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:66
 msgid "Roger Buck"
 msgstr "Roger Buck"
 
@@ -16102,7 +15867,7 @@ msgstr "取消"
 msgid "Rome (Italie)"
 msgstr "羅馬（意大利）"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:89
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:67
 msgid "Ron Wickersham"
 msgstr "Ron Wickersham"
 
@@ -16114,7 +15879,7 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:48
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:50
 msgid "Rouleau"
-msgstr ""
+msgstr "綱琴或風琴之音樂捲帶"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:38
 msgid "Rows"
@@ -16151,9 +15916,8 @@ msgstr "稱號"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:19
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-detail.tmpl:20
-#, fuzzy
 msgid "Sample"
-msgstr "姓"
+msgstr "樣本"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:348
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:350
@@ -16161,9 +15925,8 @@ msgstr "姓"
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:549
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:747
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:749
-#, fuzzy
 msgid "Sanguine"
-msgstr "語言"
+msgstr "紅色蠟筆 (sanguine)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:611
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:613
@@ -16208,7 +15971,7 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:425
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:428
 msgid "Sans regles de translitteration"
-msgstr ""
+msgstr "無音譯"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:992
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:994
@@ -16220,20 +15983,20 @@ msgstr "聖地牙哥（智利）"
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:63
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:119
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:121
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:73
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:76
 msgid "Saturday"
 msgstr "星期六"
 
 #. INPUT type=submit
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl:25
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl:12
+#: ../../koha-tmpl/intranet-tmpl/default/en/authorities/authorities.tmpl:13
+#: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:45
+#: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:185
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl:278
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:68
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/issuingrules.tmpl:56
 #: ../../koha-tmpl/intranet-tmpl/default/en/shelves.tmpl:40
-#: ../../koha-tmpl/intranet-tmpl/default/en/authorities/authorities.tmpl:13
-#: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:45
-#: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:185
 msgid "Save"
 msgstr "儲存"
 
@@ -16243,11 +16006,11 @@ msgstr "儲存"
 msgid "Save Changes"
 msgstr "儲存"
 
+#  NOTE「Code」此處係指「Country Code」
 #. INPUT type=submit name=submit
 #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:28
-#, fuzzy
 msgid "Save Code"
-msgstr "條碼"
+msgstr "儲存號碼"
 
 #. INPUT type=submit
 #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:98
@@ -16303,10 +16066,10 @@ msgstr ""
 #. INPUT type=submit
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl:82
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/newbasket2.tmpl:13
+#: ../../koha-tmpl/intranet-tmpl/default/en/help/search.marc/search.tmpl:2
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/opac-top.inc:37
 #: ../../koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl:98
 #: ../../koha-tmpl/intranet-tmpl/default/en/thesaurus_popup.tmpl:16
-#: ../../koha-tmpl/intranet-tmpl/default/en/help/search.marc/search.tmpl:2
 msgid "Search"
 msgstr "查詢"
 
@@ -16325,8 +16088,8 @@ msgid ""
 "reserve it, or see where it is"
 msgstr ""
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:28
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:26
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:28
 #, fuzzy
 msgid "Search also"
 msgstr "查詢"
@@ -16342,8 +16105,8 @@ msgstr ""
 msgid "Search catalogue"
 msgstr "查詢目錄"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/help/bull-home.tmpl:4
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/bull-home.tmpl:3
+#: ../../koha-tmpl/intranet-tmpl/default/en/help/bull-home.tmpl:4
 msgid ""
 "Search for a subscription by using the filter button (with a ISSN or a "
 "title). If you enter a title, you can use the wildcard % : entering <b>%Times"
@@ -16355,36 +16118,36 @@ msgstr ""
 msgid "Search method"
 msgstr "查詢方法"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/catalogue-home.tmpl:14
-#: ../../koha-tmpl/intranet-tmpl/default/en/members/member.tmpl:6
-#: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl:15
-#: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_210c.tmpl:11
-#: ../../koha-tmpl/intranet-tmpl/default/en/authorities/auth_finder.tmpl:11
 #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/authorities-home.tmpl:11
+#: ../../koha-tmpl/intranet-tmpl/default/en/authorities/auth_finder.tmpl:11
 #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist-auth.tmpl:10
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/search.tmpl:11
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-bib-search.tmpl:11
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/catalogue-home.tmpl:14
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/member.tmpl:6
+#: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl:15
+#: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_210c.tmpl:11
 msgid "Search on"
 msgstr "查詢"
 
 #. IMG
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:89
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:115
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:141
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:167
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:193
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:219
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:245
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:271
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:297
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:323
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:93
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:123
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:153
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:183
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:213
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:243
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:273
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:303
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:333
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:363
 #, fuzzy
 msgid "Search on this Field's Value"
 msgstr "查詢目錄"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/result.tmpl:3
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/searchresults.tmpl:8
 #: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/result.tmpl:7
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/result.tmpl:3
 msgid "Search results"
 msgstr "查詢結果"
 
@@ -16401,11 +16164,11 @@ msgstr ""
 msgid "Search the Catalogue"
 msgstr "查詢目錄"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_210c.tmpl:17
-#: ../../koha-tmpl/intranet-tmpl/default/en/authorities/auth_finder.tmpl:17
 #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/authorities-home.tmpl:23
+#: ../../koha-tmpl/intranet-tmpl/default/en/authorities/auth_finder.tmpl:17
 #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist-auth.tmpl:16
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-bib-search.tmpl:17
+#: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_210c.tmpl:17
 #, fuzzy
 msgid "Search value"
 msgstr "查詢目錄"
@@ -16416,7 +16179,7 @@ msgstr "查詢目錄"
 msgid "Seasat"
 msgstr "測試"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:90
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:68
 msgid "Sebastiaan Durand"
 msgstr "Sebastiaan Durand"
 
@@ -16460,11 +16223,10 @@ msgstr "出現過"
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:255
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:257
 msgid "Sel d'argent"
-msgstr ""
+msgstr "銀鹽 (silver halide)"
 
-#. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/issuingrules.tmpl:34
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/order.tmpl:9
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/issuingrules.tmpl:34
 msgid "Select"
 msgstr "選擇"
 
@@ -16472,8 +16234,8 @@ msgstr "選擇"
 msgid "Select Destination Branch:"
 msgstr "選擇目的分館："
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/shelves.tmpl:71
 #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:64
+#: ../../koha-tmpl/intranet-tmpl/default/en/shelves.tmpl:71
 msgid "Select Shelves to Delete"
 msgstr "選擇要移除的虛擬書架"
 
@@ -16535,8 +16297,8 @@ msgstr "選擇讀者"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:51
 msgid ""
-"Select a range of inventary codes. You can select wether a continuous range "
-"or individual inventary codes"
+"Select a range of inventary codes. You can choose a continuous range or "
+"individual inventory codes"
 msgstr ""
 
 #  NOTE 譯文更動 by Arthur
@@ -16545,7 +16307,7 @@ msgstr ""
 msgid "Select a set of MARC records"
 msgstr "選擇一組機讀格式記錄"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:122
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:123
 #, fuzzy
 msgid "Select an authority framework"
 msgstr "選擇讀者"
@@ -16588,12 +16350,11 @@ msgstr "九月"
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:609
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:807
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:809
-#, fuzzy
 msgid "Sepia"
-msgstr "期刊"
+msgstr "斯比亞褐色顏料 (sepia)"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/modbib.tmpl:50
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/receipt-search-result.tmpl:27
+#: ../../koha-tmpl/intranet-tmpl/default/en/modbib.tmpl:50
 msgid "Serial"
 msgstr "期刊"
 
@@ -16623,8 +16384,8 @@ msgstr ""
 msgid "Serials subscription detail help"
 msgstr ""
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/help/bull-home.tmpl:2
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/bull-home.tmpl:2
+#: ../../koha-tmpl/intranet-tmpl/default/en/help/bull-home.tmpl:2
 msgid "Serials subscription help"
 msgstr ""
 
@@ -16669,16 +16430,19 @@ msgstr ""
 msgid "Sermon"
 msgstr "講道"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:7
+msgid "Server information"
+msgstr "伺服器資料"
+
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:68
 msgid "Servers to query for MARC data."
 msgstr "查詢機讀格式數據時所用的伺服器"
 
 #. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/default/en/acqui/histsearch.tmpl:38
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/suggestion-select.tmpl:26
-#, fuzzy
+#: ../../koha-tmpl/intranet-tmpl/default/en/acqui/histsearch.tmpl:38
 msgid "Set Filter"
-msgstr "新增檔案"
+msgstr "設定過濾條件"
 
 #. INPUT type=submit
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/member-flags.tmpl:15
@@ -16691,7 +16455,7 @@ msgid "Set Preferences"
 msgstr "設定偏好"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:183
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:125
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:128
 #, fuzzy
 msgid "Set back to"
 msgstr "查詢"
@@ -16721,21 +16485,22 @@ msgstr "設定預約狀態為「等候中」，然後把圖書資料移交至 <b
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:12
 msgid "Set the page type."
-msgstr ""
+msgstr "設定頁面類型。"
 
+# FIXME spelling mistake in original
 #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:10
 msgid "Set width and heigth of the label that you are going to work with."
-msgstr ""
+msgstr "設定你使用的標籤的闊度及高度。"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:11
 msgid "Set your system dpi by default."
-msgstr ""
+msgstr "設定預設的 DPI 值。"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/itemtypes.tmpl:18
 msgid ""
 "Setting up item types is one of the first things you should do after "
 "installing the Koha software."
-msgstr ""
+msgstr "設定圖書資料類別，乃安裝 Koha 後其中一個必須儘快辦妥的步驟。"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/newjmember.tmpl:67
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/newmember.tmpl:95
@@ -16756,10 +16521,10 @@ msgstr "虛擬書架一覽"
 msgid "Shelf content"
 msgstr "虛擬書架內容"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/shelves.tmpl:21
-#: ../../koha-tmpl/intranet-tmpl/default/en/shelves.tmpl:61
 #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:50
 #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:108
+#: ../../koha-tmpl/intranet-tmpl/default/en/shelves.tmpl:21
+#: ../../koha-tmpl/intranet-tmpl/default/en/shelves.tmpl:61
 msgid "Shelf list"
 msgstr "虛擬書架一覽"
 
@@ -16943,19 +16708,23 @@ msgstr ""
 msgid "Spacelab"
 msgstr ""
 
+# XXX
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:28
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:30
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_122.tmpl:32
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_122.tmpl:34
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_124d.tmpl:28
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_124d.tmpl:30
-#, fuzzy
 msgid "Spatiale"
-msgstr "可重覆"
+msgstr "太空"
+
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:15
+msgid "Special thanks to the following funders"
+msgstr "特別鳴謝下列融資者"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:380
 msgid "Specifications de la bande magnetique:"
-msgstr ""
+msgstr "錄音帶音軌："
 
 #  NOTE 譯文更動 by Arthur
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:78
@@ -17019,20 +16788,20 @@ msgid "Start date <i>(%s)</i>"
 msgstr "由此日起 <i>(%s)</i>"
 
 #. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/catalogue-home.tmpl:44
-#: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl:148
-#: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_210c.tmpl:26
-#: ../../koha-tmpl/intranet-tmpl/default/en/authorities/auth_finder.tmpl:26
 #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/authorities-home.tmpl:31
+#: ../../koha-tmpl/intranet-tmpl/default/en/authorities/auth_finder.tmpl:26
 #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist-auth.tmpl:25
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/search.tmpl:38
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-bib-search.tmpl:27
+#: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/catalogue-home.tmpl:44
+#: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl:148
+#: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_210c.tmpl:26
 msgid "Start search"
 msgstr "開始查詢"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl:6
 msgid "Start, receive, modify order"
-msgstr ""
+msgstr "開訂單、收貨、修改訂單"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl:117
 msgid "Starts with"
@@ -17052,6 +16821,12 @@ msgstr "統計"
 msgid "Status"
 msgstr "狀態"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:25
+msgid ""
+"Stephen Hedges &amp; the <b>Nelsonville Public Library</b> (MARC features "
+"funders)"
+msgstr "Stephen Hedges 及 <b>Nelsonville 市立圖書館</b> (機讀目錄功能融資)"
+
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:478
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:480
 msgid "Stereographie"
@@ -17062,7 +16837,7 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:185
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:187
 msgid "Stereophonique"
-msgstr ""
+msgstr "立體聲道"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:131
 msgid "Sticky Due Date"
@@ -17074,15 +16849,17 @@ msgstr "不要重設應歸還日期"
 msgid "Still %s requests to go"
 msgstr "還有 %s 個請求"
 
+#  XXX THis is the official translation in CMARC, but it looks wrong
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:155
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:158
 msgid "Stockage sur support magnetique - informatique"
-msgstr ""
+msgstr "適於電腦磁性儲存媒體"
 
+#  XXX THis is the official translation in CMARC, but it looks wrong
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:162
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:165
 msgid "Stockage sur support magnetique - non informatique"
-msgstr ""
+msgstr "非適於電腦磁性儲存媒體"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:998
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:1000
@@ -17117,7 +16894,7 @@ msgstr "住址 (如與上列不同)"
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:789
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:791
 msgid "Stylo feutre"
-msgstr ""
+msgstr "軟毛筆 (felt-tip pen)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl:60
 msgid "SubTotal"
@@ -17128,22 +16905,22 @@ msgstr "小計"
 msgid "Subclass"
 msgstr "作者號"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:88
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/koha2marclinks.tmpl:171
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:67
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:111
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:88
 msgid "Subfield"
 msgstr "分欄"
 
 #. %1$s: TMPL_VAR name=tagsubfield
 #. %2$s: TMPL_VAR name=liblibrarian
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:62
-#, fuzzy, c-format
+#, c-format
 msgid "Subfield %s %s"
-msgstr "分欄"
+msgstr "分欄 %s %s"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:145
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:139
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:144
 msgid "Subfields"
 msgstr "分欄"
 
@@ -17232,7 +17009,7 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:8
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:14
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:10
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:13
 #, fuzzy
 msgid "Subscription information"
 msgstr "讀者資料"
@@ -17243,7 +17020,7 @@ msgid "Subscription information bloc"
 msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:131
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:80
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:83
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:8
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-detail.tmpl:9
 #, fuzzy
@@ -17305,7 +17082,7 @@ msgstr "建議"
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/suggestion-select.tmpl:7
 #: ../../koha-tmpl/intranet-tmpl/default/en/suggestion/acceptorreject.tmpl:10
 msgid "Suggested by"
-msgstr ""
+msgstr "建議者"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/suggestion-select.tmpl:6
 #: ../../koha-tmpl/intranet-tmpl/default/en/suggestion/acceptorreject.tmpl:9
@@ -17313,8 +17090,8 @@ msgid "Suggestion"
 msgstr "建議"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/suggestion-select.tmpl:3
-#: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl:149
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/search.tmpl:39
+#: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl:149
 #: ../../koha-tmpl/intranet-tmpl/default/en/suggestion/acceptorreject.tmpl:5
 msgid "Suggestions"
 msgstr "建議"
@@ -17342,13 +17119,13 @@ msgstr "名稱"
 msgid "Sujet d'examen"
 msgstr ""
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:77
-#: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/result.tmpl:15
-#: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_210c.tmpl:63
-#: ../../koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist-auth.tmpl:62
 #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist.tmpl:37
+#: ../../koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist-auth.tmpl:62
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/result.tmpl:33
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/searchresultlist.tmpl:33
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:77
+#: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/result.tmpl:15
+#: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_210c.tmpl:63
 #, fuzzy
 msgid "Summary"
 msgstr "雜項"
@@ -17356,7 +17133,7 @@ msgstr "雜項"
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:66
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:124
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:126
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:76
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:79
 msgid "Sunday"
 msgstr "星期日"
 
@@ -17372,12 +17149,12 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:375
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:378
 msgid "Supplement separe d'une revue, d'une monographie"
-msgstr ""
+msgstr "以叢刊或書籍補篇之形式出版"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/histsearch.tmpl:9
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/lateissues.tmpl:7
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:18
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:12
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/lateissues.tmpl:7
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:15
 msgid "Supplier"
 msgstr "供應商"
 
@@ -17415,7 +17192,7 @@ msgstr "供應商標價"
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:147
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:149
 msgid "Support composite"
-msgstr ""
+msgstr "多種質料組成"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:337
 msgid "Support de film"
@@ -17423,7 +17200,7 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:328
 msgid "Support de film:"
-msgstr ""
+msgstr "軟片基底："
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:1124
 msgid "Support de l'emulsion"
@@ -17432,7 +17209,7 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:337
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:339
 msgid "Support de securite"
-msgstr ""
+msgstr "安全軟片基底"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:1141
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:1143
@@ -17449,16 +17226,17 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:108
 msgid "Support physique:"
-msgstr ""
+msgstr "媒體："
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:80
 msgid "Support primaire"
-msgstr ""
+msgstr "作品質料"
 
+#  FIXME 115a may be wrong
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:1183
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:196
 msgid "Support secondaire"
-msgstr ""
+msgstr "外框質料"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:142
 #, fuzzy
@@ -17474,6 +17252,7 @@ msgstr "供應商為"
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/member.tmpl:18
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl:31
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/newmember.tmpl:244
+#: ../../koha-tmpl/intranet-tmpl/default/en/members/member-quicksearch-results.tmpl:11
 msgid "Surname"
 msgstr "姓"
 
@@ -17539,7 +17318,7 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:153
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:155
 msgid "Synthetique (plastique, vinyle...)"
-msgstr ""
+msgstr "合成物（塑膠、乙烯基等）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128b.tmpl:228
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128b.tmpl:230
@@ -17590,17 +17369,17 @@ msgstr "題名"
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl:39
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl:75
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:121
+#: ../../koha-tmpl/intranet-tmpl/default/en/reports/itemtypes.tmpl:18
 #: ../../koha-tmpl/intranet-tmpl/default/en/reports/issues_by_borrower_category.tmpl:12
 #: ../../koha-tmpl/intranet-tmpl/default/en/reports/issues_by_borrower_category.tmpl:29
-#: ../../koha-tmpl/intranet-tmpl/default/en/reports/itemtypes.tmpl:18
 msgid "TOTAL"
 msgstr "總計"
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=categorycode
 #. %2$s: TMPL_VAR name=total
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:159
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:156
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:159
 #, c-format
 msgid "TOTAL : %s : %s"
 msgstr "總計：%s：%s"
@@ -17658,23 +17437,22 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:597
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:795
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:797
-#, fuzzy
 msgid "Tache"
-msgstr "分館"
+msgstr "染色劑 (stain)"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:68
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:140
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/koha2marclinks.tmpl:170
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:68
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:134
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:68
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:139
 msgid "Tag"
 msgstr "欄"
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=tagfield
 #. %2$s: TMPL_VAR name=tagsubfield
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:20
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:18
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:20
 #, c-format
 msgid "Tag %s, Subfield %s"
 msgstr "欄 %s 分欄 %s"
@@ -17691,10 +17469,11 @@ msgstr "資料已寫入"
 msgid "Tambour, batterie"
 msgstr ""
 
+#  XXX CMARC 譯「塔米爾文」，但港譯「泰米爾文」
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:632
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:634
 msgid "Tamil"
-msgstr "泰米爾文"
+msgstr "塔米爾文"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/cat-class-list.inc:9
 msgid "Teacher Reference"
@@ -17702,15 +17481,15 @@ msgstr "教師用書"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:285
 msgid "Technique (dessins, peinture) 1"
-msgstr ""
+msgstr "技法——素描、繪畫（一）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:485
 msgid "Technique (dessins, peinture) 2"
-msgstr ""
+msgstr "技法——素描、繪畫（二）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:684
 msgid "Technique (dessins, peinture) 3"
-msgstr ""
+msgstr "技法——素描、繪畫（三）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:890
 msgid "Technique (gravure) 1"
@@ -17728,15 +17507,15 @@ msgstr ""
 msgid "Technique d'enregistrement pour les images de teledetection:"
 msgstr ""
 
+#  NOTE 暫譯，CMARC 無此分欄
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:962
-#, fuzzy
 msgid "Technique d'enregistrement:"
-msgstr "登記日期"
+msgstr "錄音技術："
 
+#  NOTE 暫譯，CMARC 無此分欄
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:998
-#, fuzzy
 msgid "Technique de reproduction:"
-msgstr "複製品"
+msgstr "複製技術："
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:704
 msgid "Technique melangees"
@@ -17782,25 +17561,24 @@ msgstr "集叢題名"
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:20
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_124d.tmpl:18
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_124d.tmpl:20
-#, fuzzy
 msgid "Terrestre"
-msgstr "測試"
+msgstr "地面"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:7
 msgid "Test"
 msgstr "測試"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:89
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:16
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:30
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:57
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:112
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:89
 #, fuzzy
 msgid "Text"
 msgstr "下一頁"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:38
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:35
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:38
 msgid "Text for OPAC"
 msgstr ""
 
@@ -17811,8 +17589,8 @@ msgid ""
 "text for librarian is used instead"
 msgstr ""
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:33
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:30
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:33
 #, fuzzy
 msgid "Text for librarian"
 msgstr "給圖書館員的說明"
@@ -17845,7 +17623,7 @@ msgstr "短訊"
 msgid "Text messaging: %s"
 msgstr "短訊：%s"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:150
+#: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:147
 msgid "Text under label"
 msgstr ""
 
@@ -17863,27 +17641,27 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:446
 msgid "Texte d'accompagnement 1:"
-msgstr ""
+msgstr "文字附件（一）："
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:532
 msgid "Texte d'accompagnement 2:"
-msgstr ""
+msgstr "文字附件（二）："
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:618
 msgid "Texte d'accompagnement 3:"
-msgstr ""
+msgstr "文字附件（三）："
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:704
 msgid "Texte d'accompagnement 4:"
-msgstr ""
+msgstr "文字附件（四）："
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:790
 msgid "Texte d'accompagnement 5:"
-msgstr ""
+msgstr "文字附件（五）："
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:876
 msgid "Texte d'accompagnement 6:"
-msgstr ""
+msgstr "文字附件（六）："
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_106.tmpl:9
 msgid "Texte presentation physique"
@@ -17904,7 +17682,6 @@ msgstr ""
 msgid "Textes sacres"
 msgstr ""
 
-# NOTE Please make sure "Title" only means book title; use "Salutation" for personal titles
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:165
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:167
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:126
@@ -17915,14 +17692,13 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:535
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:706
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:708
-#, fuzzy
 msgid "Textile"
-msgstr "題名"
+msgstr "紡織物（包括人造纖維）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:148
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:151
 msgid "Textile (y compris les fibres synthetiques)"
-msgstr ""
+msgstr "紡織品（包含人造纖維，如絲綢、布匹、尼龍等）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:617
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:619
@@ -17930,7 +17706,7 @@ msgid "Thai"
 msgstr "泰文"
 
 # NOTE Yes, this is a correct "translation". You'll need to look at the page to know why.
-#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:54
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:38
 msgid "Thanks to"
 msgstr "協助"
 
@@ -17961,6 +17737,10 @@ msgid ""
 "calculated on the exact itemtype"
 msgstr ""
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:17
+msgid "The <b>Nelsonville Public Library</b> (MARC support)"
+msgstr "<b>Nelsonville 市立圖書館</b> (機讀目錄功能)"
+
 #: ../../koha-tmpl/intranet-tmpl/default/en/user/userpage.tmpl:23
 msgid "The Amazing Apple Book by Paulette Bourgeois"
 msgstr "《The Amazing Apple Book》，Paulette Bourgeois 著"
@@ -18221,16 +18001,16 @@ msgid ""
 "revision."
 msgstr ""
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/errors/400.tmpl:15
-#: ../../koha-tmpl/intranet-tmpl/default/en/errors/402.tmpl:15
-#: ../../koha-tmpl/intranet-tmpl/default/en/errors/403.tmpl:15
-#: ../../koha-tmpl/intranet-tmpl/default/en/errors/404.tmpl:15
-#: ../../koha-tmpl/intranet-tmpl/default/en/errors/405.tmpl:15
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/400.tmpl:7
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/402.tmpl:7
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/403.tmpl:7
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/404.tmpl:7
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/405.tmpl:7
 msgid ""
 "This error means that the link was broken and that the page doesn't exist"
 msgstr ""
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/errors/401.tmpl:15
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/401.tmpl:7
 msgid "This error means that you aren't authorized to view this page"
 msgstr ""
 
@@ -18288,8 +18068,8 @@ msgstr "這個記錄目前用了 %s 次"
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=total
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:211
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:200
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:211
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/currency.tmpl:113
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl:111
 #, c-format
@@ -18304,8 +18084,8 @@ msgstr ""
 msgid "This screen shows the information associated with a given patron."
 msgstr ""
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:106
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:84
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:106
 msgid ""
 "This screen shows the subfields associated with the selected tag. You can "
 "edit subfields or add a new one by clicking on edit."
@@ -18338,7 +18118,7 @@ msgstr "這將會改變所有應用這主題的書目"
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:57
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:109
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:111
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:67
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:70
 msgid "Thursday"
 msgstr "星期四"
 
@@ -18350,9 +18130,8 @@ msgstr "請點選需要修改的圖書資料的條碼。不被點選者將維持
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:306
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:308
-#, fuzzy
 msgid "Tirage"
-msgstr "欄"
+msgstr "複製用母片 (printing master)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:34
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:36
@@ -18362,7 +18141,7 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:46
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:48
 msgid "Tirage photographique"
-msgstr ""
+msgstr "照片 (photoprint)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:231
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:233
@@ -18399,12 +18178,17 @@ msgstr "借出"
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbooks.tmpl:15
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/isbnsearch.tmpl:15
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/isbnsearch.tmpl:67
+#: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/addbookbybiblionumber.tmpl:6
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/bull-home.tmpl:7
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/search.tmpl:30
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/lateissues.tmpl:8
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/cmsdsearchresults.tmpl:7
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/searchresults.tmpl:42
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/branchtransfers.tmpl:128
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:236
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:265
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl:185
+#: ../../koha-tmpl/intranet-tmpl/default/en/help/search.marc/search.tmpl:8
 #: ../../koha-tmpl/intranet-tmpl/default/en/maint/catmaintain.tmpl:35
 #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl:14
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:119
@@ -18419,11 +18203,6 @@ msgstr "借出"
 #: ../../koha-tmpl/intranet-tmpl/default/en/modwebsites.tmpl:13
 #: ../../koha-tmpl/intranet-tmpl/default/en/modwebsites.tmpl:35
 #: ../../koha-tmpl/intranet-tmpl/default/en/overdue.tmpl:10
-#: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/addbookbybiblionumber.tmpl:6
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/bull-home.tmpl:7
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/lateissues.tmpl:8
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/search.tmpl:30
-#: ../../koha-tmpl/intranet-tmpl/default/en/help/search.marc/search.tmpl:8
 msgid "Title"
 msgstr "題名"
 
@@ -18504,6 +18283,16 @@ msgstr ""
 "為圖書資料開訂單，您必須先行搜尋該項圖書資料的書目。如果該項圖書資料已有書"
 "目，便可直接新增圖書資料至該書目；否則便要先新增一個書目，才可新增圖書資料。"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/400.tmpl:8
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/401.tmpl:8
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/402.tmpl:8
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/403.tmpl:8
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/404.tmpl:8
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/405.tmpl:8
+#, c-format
+msgid "To report this error, you can <a1>email the Koha Administrator</a>."
+msgstr ""
+
 #  NOTE If donors are also suppliers, then「供應商」is not really a「商」:-/
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl:76
 msgid ""
@@ -18513,7 +18302,7 @@ msgstr ""
 "開始進行採購──無論是開訂單、到就近的店鋪購買、還是接受捐贈──都請您先搜尋「供"
 "應商」。如有需要，請先新增一個「供應商」。"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:89
+#: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:88
 msgid "To:"
 msgstr "至："
 
@@ -18530,9 +18319,8 @@ msgstr "今日借出"
 # NOTE Please make sure "Title" only means book title; use "Salutation" for personal titles
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:89
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:91
-#, fuzzy
 msgid "Toile"
-msgstr "題名"
+msgstr "帆布"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:1016
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:1018
@@ -18619,7 +18407,7 @@ msgstr "已移交的圖書資料"
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:420
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:422
 msgid "Translitterations multiples : ISO et autres regles"
-msgstr ""
+msgstr "多種音譯法"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:89
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:91
@@ -18684,17 +18472,17 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:87
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:89
 msgid "Tres bonne"
-msgstr ""
+msgstr "最佳"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:186
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:188
 msgid "Tres elevee (61x - 90x)"
-msgstr ""
+msgstr "極高縮率（61–90 倍）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:23
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:25
 msgid "Tri-dimensionnel"
-msgstr ""
+msgstr "立體"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_110.tmpl:143
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_110.tmpl:145
@@ -18770,7 +18558,7 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:51
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:99
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:101
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:61
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:64
 msgid "Tuesday"
 msgstr "星期二"
 
@@ -18835,7 +18623,7 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:9
 msgid "Type de disque, cylindre ou bande magnetique:"
-msgstr ""
+msgstr "唱片、錄音帶或圓形錄音筒類型："
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:9
 msgid "Type de document"
@@ -18843,7 +18631,7 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:70
 msgid "Type de document:"
-msgstr ""
+msgstr "質料種類："
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_135a.tmpl:9
 msgid "Type de fichier informatique:"
@@ -18855,7 +18643,7 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:151
 msgid "Type de gravure:"
-msgstr ""
+msgstr "錄音槽切割形式："
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_125a.tmpl:9
 msgid "Type de partition:"
@@ -18873,7 +18661,7 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:171
 msgid "Type de son:"
-msgstr ""
+msgstr "聲道類型："
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:406
 #, fuzzy
@@ -18891,7 +18679,7 @@ msgstr "在空格輸入後，再按輸入鍵即可。"
 msgid "Type inconnu"
 msgstr "類別不明"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:74
+#: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:73
 msgid "Type of Interval"
 msgstr ""
 
@@ -19073,7 +18861,7 @@ msgstr "網址："
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:191
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:193
 msgid "Ultra elevee (91x -)"
-msgstr ""
+msgstr "超高縮率（91倍–）"
 
 #  NOTE 譯文更動 by Arthur
 #  NOTE 譯文更動 by Ambrose
@@ -19141,9 +18929,8 @@ msgid "Upload MARC Records"
 msgstr "上載機讀格式記錄"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:89
-#, fuzzy
 msgid "Upload MARC records in reservoir"
-msgstr "上載機讀格式記錄至Breeding Farm"
+msgstr "上載機讀格式記錄至書目庫"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/AcceptMarcUpload.tmpl:15
 #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/uploadmarc.tmpl:15
@@ -19155,8 +18942,8 @@ msgstr "上載一組機讀格式記錄"
 msgid "Upload a set of MARC records:"
 msgstr "上載一組機讀格式記錄："
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:256
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:255
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:256
 msgid "Upper Age Limit"
 msgstr "年齡上限"
 
@@ -19173,10 +18960,10 @@ msgid ""
 "allowed)."
 msgstr ""
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:102
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:182
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:105
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:179
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:102
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:182
 msgid "Upperage limit"
 msgstr "年齡上限"
 
@@ -19190,14 +18977,14 @@ msgstr "年齡上限"
 msgid "Usage"
 msgstr "儲存"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/errors/400.tmpl:16
-#: ../../koha-tmpl/intranet-tmpl/default/en/errors/401.tmpl:16
-#: ../../koha-tmpl/intranet-tmpl/default/en/errors/402.tmpl:16
-#: ../../koha-tmpl/intranet-tmpl/default/en/errors/403.tmpl:16
-#: ../../koha-tmpl/intranet-tmpl/default/en/errors/404.tmpl:16
-#: ../../koha-tmpl/intranet-tmpl/default/en/errors/405.tmpl:16
-#: ../../koha-tmpl/intranet-tmpl/default/en/errors/500.tmpl:17
-msgid "Use top menu bar to navigate again in koha."
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/400.tmpl:9
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/401.tmpl:9
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/402.tmpl:9
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/403.tmpl:9
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/404.tmpl:9
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/405.tmpl:9
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/500.tmpl:10
+msgid "Use top menu bar to navigate to another part of Koha."
 msgstr ""
 
 #  XXX 暫譯
@@ -19209,16 +18996,16 @@ msgstr ""
 "要得知最新的數字，請使用瀏覽器的「重新整理」(Reload) 按鈕。因為匯率會影響實際"
 "應付的金額，已承擔額只是一個約數。"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_210c.tmpl:64
 #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist-auth.tmpl:63
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/searchresultlist.tmpl:34
+#: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_210c.tmpl:64
 #, fuzzy
 msgid "Used"
 msgstr "使用者ID"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/suggest.tmpl:18
 msgid "Used X times"
-msgstr ""
+msgstr "使用了 X 次"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist.tmpl:38
 #, fuzzy
@@ -19372,7 +19159,7 @@ msgstr "垂直"
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:265
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:267
 msgid "Vesiculaire"
-msgstr ""
+msgstr "重泡 (vesicular)"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:132
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:134
@@ -19491,7 +19278,7 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:65
 msgid "Vitesse:"
-msgstr "速度："
+msgstr "錄音速度："
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128b.tmpl:338
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128b.tmpl:340
@@ -19590,15 +19377,17 @@ msgstr "KOHA INTRANET 歡迎您"
 msgid "WELCOME TO THE KOHA OPAC"
 msgstr "KOHA 線上目錄歡迎您"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/errors/500.tmpl:16
-msgid "Wait for a better version or mail the mainteners"
+#: ../../koha-tmpl/intranet-tmpl/default/en/errors/500.tmpl:9
+#, c-format
+msgid ""
+"Wait while system maintenance is being done or <a1>email the Koha "
+"Administrator</a>."
 msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl:39
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:158
-#, fuzzy
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:161
 msgid "Waited"
-msgstr "相關"
+msgstr "等待"
 
 #. INPUT type=submit
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/branchtransfers.tmpl:43
@@ -19636,12 +19425,12 @@ msgstr "網站網址："
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:54
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:104
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:106
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:64
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:67
 msgid "Wednesday"
 msgstr "星期三"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:169
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:116
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:119
 msgid "When more than"
 msgstr ""
 
@@ -19706,13 +19495,17 @@ msgid "Xylophone"
 msgstr "木琴"
 
 #. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:39
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:94
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:159
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl:166
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:225
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:72
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:39
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:103
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/biblio_framework.tmpl:95
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:80
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:252
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:214
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:225
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/currency.tmpl:130
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl:120
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:80
@@ -19722,35 +19515,29 @@ msgstr "木琴"
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl:124
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl:91
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl:179
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:72
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:93
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:103
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/biblio_framework.tmpl:95
 msgid "YES"
 msgstr "是"
 
-# FIXME Bug in English template
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:122
-#, fuzzy
 msgid "Year"
-msgstr "å¹´%0.0s"
+msgstr "年份"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:136
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:152
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:153
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:127
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:192
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:274
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:271
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:146
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:147
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:151
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:152
 msgid "Yes"
 msgstr "是"
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=member
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/member.tmpl:14
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:243
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:232
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:243
 #, c-format
 msgid "You Searched for %s"
 msgstr "您查詢 %s"
@@ -19908,29 +19695,28 @@ msgstr "青年小說類"
 #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/mainmenu.tmpl:4
 #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/uploadmarc.tmpl:4
 msgid "Z39.50 Search"
-msgstr "Z39.50查詢"
+msgstr "Z39.50 查詢"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl:82
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl:87
 msgid "Z39.50 Server"
-msgstr "Z39.50伺服器"
+msgstr "Z39.50 伺服器"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:67
 msgid "Z39.50 Servers"
-msgstr "Z39.50伺服器"
+msgstr "Z39.50 伺服器"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl:193
 msgid "Z39.50 Servers admin"
-msgstr "Z39.50伺服器管理"
+msgstr "Z39.50 伺服器管理"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/z3950servers.tmpl:2
-#, fuzzy
 msgid "Z39.50 servers administration"
-msgstr "Z39.50伺服器管理"
+msgstr "Z39.50 伺服器管理"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl:6
 msgid "Z3950 Search Results"
-msgstr "Z3950查詢結果"
+msgstr "Z3950 查詢結果"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:966
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:968
@@ -19966,10 +19752,10 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:95
 #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:180
-#, fuzzy
 msgid "a private bookshelf is managed by you &amp; can be seen only by you."
-msgstr "「私人」的虛擬書架只有您看得見，並且只有您才有權修改。"
+msgstr "私家書架只有您看得見，並且只有您才有權修改。"
 
+#  FIXME bug in tokenizer/scanner
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:22
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:23
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-detail.tmpl:22
@@ -19985,12 +19771,19 @@ msgstr "及"
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:264
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:266
 msgid "adulte, haut niveau"
-msgstr ""
+msgstr "成人，學術性"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl:106
 msgid "and"
 msgstr "及"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:33
+msgid ""
+"and Simon Blake, Amanda Atkins, Operations Manager, Olwen Williams, Finlay "
+"Thompson,"
+msgstr ""
+"及 Simon Blake、運作經理 Amanda Atkins、Olwen Williams、Finlay Thompson、"
+
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl:90
 msgid "and all entries depending on this one"
 msgstr "以及依存這項權威條目的所有相關條目"
@@ -20025,9 +19818,7 @@ msgstr "類別"
 msgid "at <i>%s</i>"
 msgstr "截至此日 <i>(%s)</i>"
 
-#  XXX 暫譯，要問人核對
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/authorities/authorities.tmpl:1
-#, fuzzy
 msgid "authority help"
 msgstr "權威說明"
 
@@ -20038,9 +19829,8 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:414
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:416
-#, fuzzy
 msgid "autre"
-msgstr "著者"
+msgstr "其他"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:454
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:456
@@ -20064,7 +19854,7 @@ msgstr "條碼"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:110
 msgid "be in tab -1"
-msgstr "在第「-1」格 (即不顯示)"
+msgstr "在第「-1」格（即不顯示）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:109
 msgid "be in the SAME tag (for example : 090$a and 090$b)"
@@ -20129,16 +19919,15 @@ msgstr "預算金額"
 msgid "budgets and bookfunds"
 msgstr "預算案及書籍採購資金"
 
-#  NOTE 譯文更動 by Arthur
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=author
+#: ../../koha-tmpl/intranet-tmpl/default/en/suggestion/mail_suggestion_ORDERED.tmpl:3
 #: ../../koha-tmpl/intranet-tmpl/default/en/suggestion/mail_suggestion_ACCEPTED.tmpl:3
 #: ../../koha-tmpl/intranet-tmpl/default/en/suggestion/mail_suggestion_AVAILABLE.tmpl:3
-#: ../../koha-tmpl/intranet-tmpl/default/en/suggestion/mail_suggestion_ORDERED.tmpl:3
 #: ../../koha-tmpl/intranet-tmpl/default/en/suggestion/mail_suggestion_REJECTED.tmpl:3
-#, fuzzy, c-format
+#, c-format
 msgid "by %s"
-msgstr "任何 %s"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:33
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:35
@@ -20153,22 +19942,20 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl:12
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl:81
-#, fuzzy
 msgid "catalogue details"
-msgstr "館藏查詢"
+msgstr "目錄詳情"
 
 #. For the first occurrence,
 #. SCRIPT
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:60
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:61
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:60
 msgid "categorycode missing"
 msgstr "沒有填寫類別編號"
 
 #. INPUT type=submit
 #: ../../koha-tmpl/intranet-tmpl/default/en/suggestion/acceptorreject.tmpl:42
-#, fuzzy
 msgid "change status"
-msgstr "匯率"
+msgstr "修改狀態"
 
 #. SCRIPT
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl:72
@@ -20177,9 +19964,9 @@ msgstr "「預設使用」只可填 0 或者 1"
 
 #. %1$s: TMPL_VAR name=closedate
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl:46
-#, fuzzy, c-format
+#, c-format
 msgid "closed on %s <a1>View</a>"
-msgstr "%S - %s <a1>+</a>"
+msgstr ""
 
 #. INPUT type=reset name=reset
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:6
@@ -20195,6 +19982,7 @@ msgstr "重設"
 msgid "coming from"
 msgstr "源自"
 
+#  NOTE UNIMARC field 8 maps to CMARC field 6, but CMARC does not have field 6c
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:298
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:300
 msgid "compte/departement"
@@ -20213,9 +20001,8 @@ msgid "copy. year:%s"
 msgstr "著作年份：%s"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/reports/itemtypes.tmpl:9
-#, fuzzy
 msgid "count"
-msgstr "折扣"
+msgstr "數量"
 
 #. SCRIPT
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl:72
@@ -20223,9 +20010,8 @@ msgid "database missing"
 msgstr "沒有填寫資料庫"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:12
-#, fuzzy
 msgid "day"
-msgstr "繳交"
+msgstr "日"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:4
 msgid "default MARC framework"
@@ -20235,18 +20021,17 @@ msgstr ""
 msgid "default framework"
 msgstr ""
 
-#. INPUT type=image name=delete
+#: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:12
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl:34
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl:46
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl:227
-#: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:12
 msgid "delete"
 msgstr "移除"
 
 #. For the first occurrence,
 #. SCRIPT
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:60
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:61
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:60
 msgid "description missing"
 msgstr "沒有填寫說明"
 
@@ -20292,7 +20077,7 @@ msgstr "百科全書"
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:252
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:254
 msgid "enfant"
-msgstr "兒童"
+msgstr "兒童，9–14 歲"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:1006
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:1008
@@ -20314,7 +20099,7 @@ msgstr "州/省"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/issuingrules.tmpl:21
 msgid "everywhere"
-msgstr ""
+msgstr "任何地方"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl:18
 msgid "exchange rates"
@@ -20339,9 +20124,8 @@ msgstr "小說"
 #. INPUT type=submit
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/bull-home.tmpl:20
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/lateissues.tmpl:22
-#, fuzzy
 msgid "filter"
-msgstr "印表機"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl:11
 #, fuzzy
@@ -20350,9 +20134,9 @@ msgstr "或"
 
 #. %1$s: TMPL_VAR name=branch
 #: ../../koha-tmpl/intranet-tmpl/default/en/reports/itemtypes.tmpl:5
-#, fuzzy, c-format
+#, c-format
 msgid "for branch = %s"
-msgstr "登記之館別：%s"
+msgstr ""
 
 #. %1$s: TMPL_VAR name=borrower_category
 #: ../../koha-tmpl/intranet-tmpl/default/en/reports/issues_by_borrower_category.tmpl:5
@@ -20396,7 +20180,7 @@ msgstr "由書目記錄號碼：%S 至書目記錄號碼：%S"
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:326
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:328
 msgid "gouvernement en exil ou clandestin"
-msgstr ""
+msgstr "流亡政府機構"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/marc_subfields_structure.tmpl:18
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/marctagstructure.tmpl:18
@@ -20405,8 +20189,8 @@ msgid ""
 "usually for internal fields"
 msgstr ""
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:134
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:109
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:134
 msgid "hidden,"
 msgstr ""
 
@@ -20448,27 +20232,25 @@ msgstr ""
 "可以借出，但個別圖書資料可以分別設定成不可借出。"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/search.marc/search.tmpl:25
-#, fuzzy
 msgid "ignored"
 msgstr "忽略"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:346
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:349
 msgid "il ne s'agit pas d'une publication officielle"
-msgstr ""
+msgstr "非政府出版品"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_700-4.tmpl:13
 msgid "illustrateur"
 msgstr "繪圖"
 
-#  XXX 暫譯
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=publicationyear
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/suggestion-select.tmpl:39
 #: ../../koha-tmpl/intranet-tmpl/default/en/suggestion/acceptorreject.tmpl:30
-#, fuzzy, c-format
+#, c-format
 msgid "in <i>%s</i>"
-msgstr "截至此日 <i>(%s)</i>"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:163
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:165
@@ -20505,8 +20287,8 @@ msgstr ""
 msgid "insert a new authority : %S"
 msgstr "插入一個新權威：%S"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:135
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:110
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:135
 msgid "is an url,"
 msgstr "為網址，"
 
@@ -20563,9 +20345,8 @@ msgstr "itemtypes 表有至少一個數值"
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:205
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:257
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:259
-#, fuzzy
 msgid "jeune adulte"
-msgstr "應歸還日期"
+msgstr "青少年，14-20 歲"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl:80
 msgid "lib"
@@ -20576,13 +20357,14 @@ msgstr "說明"
 msgid "link : useless for instance"
 msgstr ""
 
+#  NOTE UNIMARC field 8d, no such CMARC field, but seems to map to field 6b
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:306
 msgid "local(municiapal, etc.)"
-msgstr ""
+msgstr "地方機構"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:304
 msgid "local(municipal, etc.)"
-msgstr ""
+msgstr "地方機構"
 
 #. INPUT type=submit
 #: ../../koha-tmpl/intranet-tmpl/default/en/auth.tmpl:39
@@ -20618,54 +20400,56 @@ msgstr "修改"
 msgid "mois %S"
 msgstr "月份 %S"
 
+#  NOTE 這是從 CMARC 照抄的，但與法文原文不乎，很可能有錯
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:96
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:99
 msgid "monographie avec date publication detaillee"
-msgstr ""
+msgstr "文獻詳細出版時間"
 
+#  NOTE 這也是從 CMARC 照抄的，但也與法文原文不乎，很可能有錯
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:85
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:89
 msgid ""
 "monographie ayant a la fois une date d'edition ou de reedition et une date "
 "de production"
-msgstr ""
+msgstr "影片、錄音或錄影資料同時有發行年與製作年者"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:74
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:78
 msgid ""
 "monographie ayant a la fois une date reelle et une date de copyright ou de "
 "privilege"
-msgstr ""
+msgstr "單行本同時有出版年與版權年者"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:64
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:67
 msgid "monographie dont la publication s'etend sur plus d'un an"
-msgstr ""
+msgstr "單行本出版年在一年以上者"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:55
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:58
 msgid "monographie, date de publication incertaine"
-msgstr ""
+msgstr "單行本出版年不確定者"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:24
-#, fuzzy
 msgid "month"
-msgstr "金額"
+msgstr "月"
 
+#  NOTE UNIMARC field 8e, no corresponding CMARC field
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:310
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:313
 msgid "multi-local(inter-departemental, etc. sous le niveau national)"
-msgstr ""
+msgstr "跨地方/跨部門"
 
 #. INPUT type=image
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:80
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl:158
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:156
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:168
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:173
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:134
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:172
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:80
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:151
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/biblio_framework.tmpl:137
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl:158
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:157
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:168
 msgid "next"
 msgstr "下一頁"
 
@@ -20690,10 +20474,11 @@ msgstr "非"
 msgid "not seen since"
 msgstr "右列日期起未出現過"
 
+#  NOTE CMARC has "修正紀錄代碼" : "修正" (field 7 instead of 9)
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:378
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:380
 msgid "notice modifiee"
-msgstr ""
+msgstr "修正"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:45
 #, fuzzy
@@ -20701,7 +20486,7 @@ msgid "on"
 msgstr "無"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:163
-#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:110
+#: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:113
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:22
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:23
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-detail.tmpl:22
@@ -20740,15 +20525,15 @@ msgstr ""
 msgid "open on"
 msgstr ""
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/auth-top.inc:67
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/bull-top.inc:46
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc:50
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/circulation-top.inc:61
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/error-top.inc:55
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/marc-top.inc:56
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/members-top.inc:46
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/parameters-top.inc:47
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/reports-top.inc:46
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/auth-top.inc:67
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/bull-top.inc:46
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/error-top.inc:55
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/marc-top.inc:56
 #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes-top.inc:218
 msgid "options &gt;&gt;&nbsp;&nbsp;"
 msgstr "選項 &gt;&gt;　"
@@ -20769,7 +20554,7 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/addbookbybiblionumber.tmpl:9
 msgid "or add to a new bookshelf"
-msgstr ""
+msgstr "或新增至新的虛擬書架"
 
 #. %1$s: TMPL_VAR name=name
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl:8
@@ -20780,7 +20565,7 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:44
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:83
 msgid "photographique"
-msgstr ""
+msgstr "照像（例如以傳統可見光譜航空照像技術所製作之地圖）"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl:21
 msgid "planned for"
@@ -20802,9 +20587,8 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:328
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:331
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:333
-#, fuzzy
 msgid "plans"
-msgstr "Al Banks"
+msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/marc_subfields_structure.tmpl:22
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/marctagstructure.tmpl:22
@@ -20818,8 +20602,9 @@ msgid ""
 msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/popup-top.inc:5
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/quicksearch-top.inc:5
 msgid "popup"
-msgstr ""
+msgstr "彈出通知"
 
 #. SCRIPT
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl:72
@@ -20837,14 +20622,14 @@ msgid "postface"
 msgstr "書後語"
 
 #. INPUT type=image
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:75
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl:157
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:152
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:163
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:168
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:130
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:167
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:75
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:150
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/biblio_framework.tmpl:136
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl:157
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:153
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:163
 msgid "previous"
 msgstr "上一頁"
 
@@ -20872,9 +20657,8 @@ msgid "published by:%s"
 msgstr "出版者：%s"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:33
-#, fuzzy
 msgid "quarter"
-msgstr "更新"
+msgstr "å­£"
 
 #. SCRIPT
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl:72
@@ -20907,7 +20691,7 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:48
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:50
 msgid "reproduction"
-msgstr "複製品"
+msgstr "重印本、影印本、影鈔本、翻印本"
 
 #. INPUT type=submit
 #: ../../koha-tmpl/intranet-tmpl/default/en/request.tmpl:71
@@ -20945,8 +20729,8 @@ msgid "same itemtype and borrower category, branch *"
 msgstr ""
 
 #. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/default/en/acqui/recieveorder.tmpl:22
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl:91
+#: ../../koha-tmpl/intranet-tmpl/default/en/acqui/recieveorder.tmpl:22
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl:123
 msgid "save"
 msgstr "儲存"
@@ -20958,16 +20742,16 @@ msgstr "儲存"
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:247
 #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:249
 msgid "scolaire"
-msgstr ""
+msgstr "學齡兒童，5-10 歲"
 
 #  NOTE「See」中文譯「見」，「See also」中文譯「參見」，請勿改動
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=seealso
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:133
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:108
-#, fuzzy, c-format
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:133
+#, c-format
 msgid "see also : %s,"
-msgstr "參見"
+msgstr "參見：%s、"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:22
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:23
@@ -20979,9 +20763,9 @@ msgstr ""
 #. %1$s: TMPL_VAR name=basketno
 #. %2$s: TMPL_VAR name=name
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl:4
-#, fuzzy, c-format
+#, c-format
 msgid "shopping Basket <b>%s </b>for <a1>%s</a>"
-msgstr "<a1></a>%2$s 的購物籃 %1$s"
+msgstr "<a1>%2$s</a> 的購物籃 <b>%1$s</b>"
 
 # FIXME Strictly speaking untranslatable. Arguably a template bug, but difficult to fix
 #: ../../koha-tmpl/intranet-tmpl/default/en/reports/inventory.tmpl:15
@@ -21008,14 +20792,13 @@ msgstr "由此日起"
 msgid "statistiques"
 msgstr "統計"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:127
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:104
-#, fuzzy
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:127
 msgid "subfield ignored"
-msgstr "分欄"
+msgstr "分欄已被忽略"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:155
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:149
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:154
 msgid "subfields"
 msgstr "分欄"
 
@@ -21035,35 +20818,36 @@ msgstr ""
 msgid "summary"
 msgstr ""
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:83
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:83
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:83
 msgid "tag"
 msgstr "欄號"
 
 #. For the first occurrence,
 #. SCRIPT
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:55
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:55
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:55
 msgid "tag number missing"
 msgstr "沒有填寫欄號"
 
 #. META http-equiv=Content-Type
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/about-top.inc:7
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-top.inc:7
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc:5
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/circulation-top.inc:6
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/members-top.inc:7
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/opac-top.inc:7
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/parameters-top.inc:6
-#: ../../koha-tmpl/intranet-tmpl/default/en/includes/reports-top.inc:7
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/auth-search-top.inc:6
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/auth-top.inc:6
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/bull-top.inc:7
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc:5
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/circulation-top.inc:6
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/error-top.inc:6
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/help-top.inc:6
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/marc-top.inc:6
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/members-top.inc:7
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/neutral-top.inc:6
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/opac-top.inc:7
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/parameters-top.inc:6
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/popup-top.inc:6
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/reports-top.inc:7
+#: ../../koha-tmpl/intranet-tmpl/default/en/includes/quicksearch-top.inc:6
 #: ../../koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl:2
 #: ../../koha-tmpl/intranet-tmpl/default/en/auth.tmpl:1
 #: ../../koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl:6
@@ -21078,7 +20862,7 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:53
 msgid "the biblioitems.itemtype field MUST :"
-msgstr "biblioitems.itemtype欄必須："
+msgstr "biblioitems.itemtype 欄必須："
 
 #  NOTE 譯文更動 by Arthur
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:67
@@ -21087,14 +20871,12 @@ msgstr "branch table是空白的，它必須至少有一個數值！"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:81
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:95
-#, fuzzy
 msgid "the correspounding subfield MUST have authorised value=\"branches\""
-msgstr "對應的分欄必須設定容許值為branches"
+msgstr "對應的分欄必須設定容許值為「branches」"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:55
-#, fuzzy
 msgid "the correspounding subfield MUST have authorised_value=\"itemtype\""
-msgstr "對應的分欄必須設定容許值為itemtype"
+msgstr "對應的分欄必須設定容許值為「itemtype」"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:45
 msgid ""
@@ -21104,11 +20886,11 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:93
 msgid "the items.holdingbranch field MUST :"
-msgstr "items.holdingbranch欄必須："
+msgstr "items.holdingbranch 欄必須："
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:79
 msgid "the items.homebranch field MUST :"
-msgstr "items.homebranch欄必須"
+msgstr "items.homebranch 欄必須"
 
 #  NOTE 譯文更動 by Arthur
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:41
@@ -21165,14 +20947,14 @@ msgstr "譯者"
 
 #. For the first occurrence,
 #. SCRIPT
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:60
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:61
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:60
 msgid "upperagelimit is not a number"
 msgstr "您填寫的年齡上限並非數字"
 
 #  NOTE 譯文更動 by Arthur
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:144
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:138
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:143
 msgid "value"
 msgstr "數值"
 
@@ -21208,7 +20990,7 @@ msgstr ""
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:15
 msgid "week"
-msgstr "週刊"
+msgstr "週"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:25
 #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-detail.tmpl:24
@@ -21228,7 +21010,7 @@ msgstr "沒有填寫字詞"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:39
 msgid "year"
-msgstr "年刊"
+msgstr "å¹´"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl:16
 msgid "z3950 search"
@@ -21608,6 +21390,20 @@ msgstr ""
 #~ msgid "<b>Item:</b> %s"
 #~ msgstr "<b>圖書資料：</b>%s"
 
+#~ msgid ""
+#~ "<b>Katipo Communications</b> : Rachel Hamilton-Williams, General Manager "
+#~ "(Webmistress), Chris Cormack, 1.2 release manager and Simon Blake, Amanda "
+#~ "Atkins, Operations Manager, Olwen Williams, Finlay Thompson, Gynn Lomax, "
+#~ "Richard Anderson, Jeremy Blake, Rebecca Holden, Olive T. Canine"
+#~ msgstr ""
+#~ "<b>Katipo Communications</b>：總經理 Rachel Hamilton-Williams（網站管理"
+#~ "人）、Chris Cormack（第1.2版出版主任）、以及 Simon Blake、運作經理 Amanda "
+#~ "Atkins、Olwen Williams、Finlay Thompson、Gynn Lomax、Richard Anderson、"
+#~ "Jeremy Blake、Rebecca Holden、Olive T. Canine"
+
+#~ msgid "<b>Pat Eyler</b>, Kaitiaki"
+#~ msgstr "守護者 <b>Pat Eyler</b>"
+
 #~ msgid "<b>Search :</b>Using more fields for your search will slow it down."
 #~ msgstr "<b>查詢：</b>使用愈多欄位查詢，查詢就愈慢。"
 
@@ -21654,6 +21450,12 @@ msgstr ""
 #~ msgid "Add New Website"
 #~ msgstr "新增網站"
 
+#~ msgid "Ambrose Li"
+#~ msgstr "黎爵榮"
+
+#~ msgid "Andrew Arensburger"
+#~ msgstr "Andrew Arensburger"
+
 #~ msgid "Année début"
 #~ msgstr "創刊年份"
 
@@ -21709,12 +21511,12 @@ msgstr ""
 #~ msgid "Category :"
 #~ msgstr "類別："
 
-#~ msgid "Chris Cormack, 1.2 release manager"
-#~ msgstr "Chris Cormack (1.2版出版主任)"
-
 #~ msgid "Click <a1>here</a> to continue to see Member Info."
 #~ msgstr "按<a1>這裏</a>查看讀者資料。"
 
+#~ msgid "Credits"
+#~ msgstr "鳴謝："
+
 #~ msgid "DATE DUE"
 #~ msgstr "應歸還日期"
 
@@ -21725,12 +21527,18 @@ msgstr ""
 #~ msgid "Date of Birth"
 #~ msgstr "出生日期"
 
+#~ msgid "Dorian Meid"
+#~ msgstr "Dorian Meid"
+
 #~ msgid "END"
 #~ msgstr "完"
 
 #~ msgid "EXCHANGE RATES"
 #~ msgstr "匯率"
 
+#~ msgid "Ed Summers"
+#~ msgstr "Ed Summers"
+
 #~ msgid "Error Issuing Book"
 #~ msgstr "借出過程中出現錯誤"
 
@@ -21758,6 +21566,9 @@ msgstr ""
 #~ msgid "ITEMS REQUESTED"
 #~ msgstr "已預約的圖書資料"
 
+#~ msgid "Issue limit"
+#~ msgstr "限借數量"
+
 # NOTE: title and author
 #~ msgid "Item %s (%s)"
 #~ msgstr "圖書資料「%s」(%s)"
@@ -21765,15 +21576,15 @@ msgstr ""
 #~ msgid "Item: %s (%s)"
 #~ msgstr "圖書資料：%s (%s)"
 
+#~ msgid "Jérome Vizcaino (Esiee School)"
+#~ msgstr "J&eacute;rome Vizcaino (ESIEE學院)"
+
 #~ msgid "KOHA: <a1>HDL INTRANET</A>"
 #~ msgstr "KOHA: <a1>HDL INTRANET</A>"
 
 #~ msgid "KOHA: INTRANET: Issues & Returns"
 #~ msgstr "KOHA：INTRANET：借出及還書"
 
-#~ msgid "Katipo Communications"
-#~ msgstr "Katipo Communications"
-
 #~ msgid "Keyword:"
 #~ msgstr "關鍵詞："
 
@@ -21811,6 +21622,9 @@ msgstr ""
 #~ msgid "Membership Category*"
 #~ msgstr "讀者類別*"
 
+#~ msgid "Michel Lerenard (Esiee School)"
+#~ msgstr "Michel Lerenard (ESIEE學院)"
+
 #~ msgid "ODUES"
 #~ msgstr "過期未還"
 
@@ -21829,6 +21643,9 @@ msgstr ""
 #~ msgid "Ph: %s, Fax: %s"
 #~ msgstr "電話：%s，傳真：%s"
 
+#~ msgid "Pierre Cauchois (Esiee School)"
+#~ msgstr "Pierre Cauchois (ESIEE學院)"
+
 #~ msgid "Previous"
 #~ msgstr "上一頁"
 
@@ -21842,9 +21659,6 @@ msgstr ""
 #~ msgid "RETURNED"
 #~ msgstr "還書日期"
 
-#~ msgid "Rachel Hamilton-Williams, General Manager (Webmistress)"
-#~ msgstr "Rachel Hamilton-Williams (總經理兼網站管理人)"
-
 #  NOTE 譯文更動 by Arthur
 #  NOTE 譯文更動 by Ambrose
 #~ msgid "Receipt Summary for : <i>%s</i> Invoice <i>%s</i>"
@@ -21853,6 +21667,9 @@ msgstr ""
 #~ msgid "Relationship*"
 #~ msgstr "關係*"
 
+#~ msgid "Renseignement techniques sur la musique"
+#~ msgstr "音樂作品之技術資料"
+
 #~ msgid "Rep"
 #~ msgstr "可重覆"
 
diff --git a/misc/translator/po/stats.pl b/misc/translator/po/stats.pl
new file mode 100755
index 0000000000..e0593fff3c
--- /dev/null
+++ b/misc/translator/po/stats.pl
@@ -0,0 +1,122 @@
+#!/usr/bin/perl
+
+# Copyright 2003-2004 Nathan Walp <faceprint@faceprint.com>
+# Adapted for Koha by Ambrose Li <acli@ada.dhs.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 50 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+#
+
+
+my $PACKAGE="koha";
+
+
+use Locale::Language;
+
+$lang{en_AU} = "English (Australian)";
+$lang{en_CA} = "English (Canadian)";
+$lang{en_GB} = "English (British)";
+$lang{es_AR} = "Spanish (Argentinian)";
+$lang{fr_FR} = "French"; # FIXME: should be just "fr"
+$lang{it_IT} = "Italian"; # FIXME: should be just "it"
+$lang{my_MM} = "Burmese (Myanmar)";
+$lang{pl_PL} = "Polish"; # FIXME: should be just "pl"
+$lang{pt_BR} = "Portuguese (Brazilian)";
+$lang{'sr@Latn'} = "Serbian (Latin)";
+$lang{zh_CN} = "Chinese (Simplified)";
+$lang{zh_TW} = "Chinese (Traditional)";
+
+$ENV{LANG} = $ENV{LC_ALL} = 'C';
+
+opendir(DIR, ".") || die "can't open directory: $!";
+@pos = grep { /\.po$/ && -f } readdir(DIR);
+foreach (@pos) { s/\.po$//; };
+closedir DIR;
+
+@pos = sort @pos;
+
+$now = `date`;
+
+system("./update.pl --pot > /dev/null");
+
+print "<html>\n";
+print "<head><title>$PACKAGE i18n statistics</title></head>\n";
+print "<body>\n";
+
+opendir(DIR, ".") || die "can't open directory: $!";
+@templates = grep { /\.pot$/ && -f } readdir(DIR);
+foreach (@templates) { s/\.pot$//; };
+closedir DIR;
+for my $PACKAGE (sort {
+	    my($theme1, $module1) = ($1, $2) if $a =~ /^(.*)_([^_]+)$/;
+	    my($theme2, $module2) = ($1, $2) if $b =~ /^(.*)_([^_]+)$/;
+	    return $module1 cmp $module2 || $theme1 cmp $theme2
+	} @templates) {
+    my @pos_orig = @pos;
+    my @pos = grep { /^${PACKAGE}_/ } @pos_orig;
+    my($theme, $module) = ($1, $2) if $PACKAGE =~ /^(.*)_([^_]+)$/;
+
+$_ = `msgfmt --statistics $PACKAGE.pot -o /dev/null 2>&1`;
+
+die "unable to get total: $!" unless (/(\d+) untranslated messages/);
+
+$total = $1;
+
+print "<h1>Module $module, theme $theme</h1>\n";
+print "<table cellspacing='0' cellpadding='0' border='0' bgcolor='#888888' width='100%'><tr><td><table cellspacing='1' cellpadding='2' border='0' width='100%'>\n";
+
+print"<tr bgcolor='#e0e0e0'><th>language</th><th style='background: #339933;'>trans</th><th style='background: #339933;'>%</th><th style='background: #333399;'>fuzzy</th><th style='background: #333399;'>%</th><th style='background: #dd3333;'>untrans</th><th style='background: #dd3333;'>%</th><th>&nbsp;</th></tr>\n";
+
+foreach $index (0 .. $#pos) {
+	$trans = $fuzz = $untrans = 0;
+	$po = $pos[$index];
+	next if $po =~ /_en_EN/; # Koha-specific
+	print STDERR "$po..." if($ARGV[0] eq '-v');
+	system("msgmerge $po.po $PACKAGE.pot -o $po.new 2>/dev/null");
+	$_ = `msgfmt --statistics $po.new -o /dev/null 2>&1`;
+	chomp;
+	if(/(\d+) translated message/) { $trans = $1; }
+	if(/(\d+) fuzzy translation/) { $fuzz = $1; }
+	if(/(\d+) untranslated message/) { $untrans = $1; }
+	$transp = 100 * $trans / $total;
+	$fuzzp = 100 * $fuzz / $total;
+	$untransp = 100 * $untrans / $total;
+	if($index % 2) {
+		$color = " bgcolor='#e0e0e0'";
+	} else {
+		$color = " bgcolor='#d0e0ff'";
+	}
+	my $lang = $1 if $po =~ /^${PACKAGE}_(.*)$/; # Koha-specific
+	$name = "";
+	$name = $lang{$lang}; # NOTE
+	$name = code2language($lang) unless $name ne ""; # NOTE
+	$name = "???" unless $name ne "";
+	printf "<tr$color><td>%s(%s.po)</td><td>%d</td><td>%0.2f</td><td>%d</td><td>%0.2f</td><td>%d</td><td>%0.2f</td><td>",
+	$name, $po, $trans, $transp, $fuzz, $fuzzp, $untrans, $untransp;
+	printf "<img src='bar_g.gif' height='15' width='%0.0f' />", $transp*2
+	unless $transp*2 < 0.5;
+	printf "<img src='bar_b.gif' height='15' width='%0.0f' />", $fuzzp*2
+	unless $fuzzp*2 < 0.5;
+	printf "<img src='bar_r.gif' height='15' width='%0.0f' />", $untransp*2
+	unless $untransp*2 < 0.5;
+	print "</tr>\n";
+	unlink("$po.new");
+	print STDERR "done ($untrans untranslated strings).\n" if($ARGV[0] eq '-v');
+}
+print "</table></td></tr></table>\n";
+print "Latest $PACKAGE.pot generated $now: <a href='$PACKAGE.pot'>$PACKAGE.pot</a><br />\n";
+}
+print "</body>\n";
+print "</html>\n";
+
diff --git a/misc/translator/po/update.pl b/misc/translator/po/update.pl
new file mode 100755
index 0000000000..6021cdff4f
--- /dev/null
+++ b/misc/translator/po/update.pl
@@ -0,0 +1,59 @@
+#!/usr/bin/perl
+
+# Convenience script to update two po files at once
+# This emulates the GNOME "update.pl" script
+
+use strict;
+use integer;
+use Getopt::Long;
+
+use vars qw( $pot_p );
+
+GetOptions(
+   '--pot' => \$pot_p,
+) || exit(1);
+
+my $lang = $ARGV[0];
+die <<EOF unless $pot_p || $lang =~ /^[a-z]{2}(?:_[A-Z]{2})?$/;
+Usage: $0 LANG
+       $0 --pot
+EOF
+
+# Remember whether we see the "po" directory; this is used later to guess
+# whether the current directory is translator/po or translator.
+my $chdir_needed_p = 1 unless -d('po');
+
+# Go through the theme/module combinations we need to update. There can be
+# more than two; e.g., if we want ['default', 'opac'] too we can put it in
+for my $spec (
+      ['css',     'opac'    ],
+      ['default', 'intranet']
+) {
+   my($theme, $module) = @$spec;
+   my $pid = fork;
+   die "fork: $!\n" unless defined $pid;
+   if (!$pid) {
+
+      # If current directory is translator/po instead of translator,
+      # then go back to the parent
+      if ($chdir_needed_p) {
+	 chdir('..') || die "..: cd: $!\n";
+      }
+
+      # Now call tmpl_process3.pl to do the real work
+      #
+      # Traditionally, the pot file should be named PACKAGE.pot
+      # (for Koha probably something like koha_intranet_css.pot),
+      # but this is not Koha's convention.
+      #
+      my $target = "po/${theme}_${module}" . ($pot_p? ".pot": "_$lang.po");
+      rename($target, "$target~") if $pot_p;
+      exec('./tmpl_process3.pl', ($pot_p? 'create': 'update'),
+	    '-i', "../../koha-tmpl/$module-tmpl/$theme/en/",
+	    '-s', $target, '-r');
+
+      die "tmpl_process3.pl: exec: $!\n";
+   }
+   wait;
+}
+
diff --git a/misc/translator/translator_doc.html b/misc/translator/translator_doc.html
index 73e57332df..e9f81ad944 100644
--- a/misc/translator/translator_doc.html
+++ b/misc/translator/translator_doc.html
@@ -3,16 +3,17 @@
 
 <p>
 This transation tool should greatly help Koha translators.
-It's composed of 2&nbsp;scripts:
+It's composed of 2&nbsp;scripts
+(with a number of associated perl module files):
 
-<ul>
+<ol>
 <li>xgettext.pl, that extracts the texts in a template,
-    and which is called by the script
+    and which is called by the script; and
 <li>tmpl_process3.tmpl, which can do 3 things:
-    <ul>
-    <li>create a file with all the "translatable strings" in all files in a directory (& its subdirectories)
-    <li>update an existing translation file.
-    <li>rebuild translated templates from english & translation file.
+    <ol type=a>
+    <li>create a file with all the "translatable strings" in all files in a directory (& its subdirectories),
+    <li>update an existing translation file, and
+    <li>rebuild translated templates from English & translation file.
     </ul>
 </ul>
 <p>
@@ -27,20 +28,22 @@ perldoc tmpl_process3.pl.
 <li>Create your translation file
     (assuming your current directory is this directory, i.e., misc/translator):
     <blockquote>
-./tmpl_process.pl create -i ../../koha-tmpl/opac-tmpl/default/en/ -s css_opac_fr_FR.po -r
+./tmpl_process3.pl create -i ../../koha-tmpl/opac-tmpl/default/en/ -s po/css_opac_fr_FR.po -r
     </blockquote>
     <p>(In the above example,
     ../../koha-tmpl/opac-tmpl/default/en/
     contains the English templates in the "default" theme,
     and po/css_opac_fr_FR.po is where you want the generated PO file to appear.
-    The use of relative paths for the English templates is recommended
-    but is not necessary;
-    it makes the resulting PO files somewhat easier to read.)
+    The use of relative paths for the English templates is recommended;
+    it makes the resulting PO files slightly shorter
+    and more usable in a team environment.
+    Absolute paths are certainly fine,
+    and might be better if there is only one translator for your language.)
 <li>Translate your css_opac_fr_FR.po file
     using a text editor or a PO file translation tool.
 <li>Create your translated templates:
     <blockquote>
-./tmpl_process.pl install -i ../../koha-tmpl/opac-tmpl/default/en/ -o /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/fr2/ -s css_opac_fr_FR.po -r
+./tmpl_process3.pl install -i ../../koha-tmpl/opac-tmpl/default/en/ -o /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/fr2/ -s po/css_opac_fr_FR.po -r
     </blockquote>
     <p>
     (In the above example,
@@ -50,17 +53,17 @@ perldoc tmpl_process3.pl.
 </ol>
 
 <p>
-If something changes in English version:
+If something changes in the English version:
 <ol>
 <li>Update your translation file:
     <blockquote>
-./tmpl_process.pl update -i /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/en/ -s po/css_opac_fr_FR.po -r
+./tmpl_process3.pl update -i ../../koha-tmpl/opac-tmpl/default/en/ -s po/css_opac_fr_FR.po -r
     </blockquote>
-<li>Translate your new css_opac_fr_FR.po file.
+<li>Translate your newly updated css_opac_fr_FR.po file.
     Look for strings marked as "fuzzy" and strings that are not translated.
 <li>Create your translated templates:
     <blockquote>
-./tmpl_process.pl install -i /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/en/ -o /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/fr2/ -s po/css_opac_fr_FR.po -r
+./tmpl_process3.pl install -i ../../koha-tmpl/opac-tmpl/default/en/ -o /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/fr2/ -s po/css_opac_fr_FR.po -r
     </blockquote>
 <li>Copy new images/css files in your new directory if needed
 </ol>
diff --git a/misc/translator/translator_doc.txt b/misc/translator/translator_doc.txt
index 2e1b226c3d..0322fbda2c 100644
--- a/misc/translator/translator_doc.txt
+++ b/misc/translator/translator_doc.txt
@@ -2,15 +2,15 @@ TRANSLATION TOOL, V3.0:
 ======================
 
 This transation tool should greatly help Koha translators. It's composed of
-2 scripts:
+2 scripts (with a number of associated perl module files):
 
-  * xgettext.pl, that extracts the texts in a template, and which is called by
-    the script
-  * tmpl_process3.tmpl, which can do 3 things:
-      + create a file with all the "translatable strings" in all files in a
-        directory (& its subdirectories)
-      + update an existing translation file.
-      + rebuild translated templates from english & translation file.
+ 1. xgettext.pl, that extracts the texts in a template, and which is called by
+    the script; and
+ 2. tmpl_process3.tmpl, which can do 3 things:
+     a. create a file with all the "translatable strings" in all files in a
+        directory (& its subdirectories),
+     b. update an existing translation file, and
+     c. rebuild translated templates from English & translation file.
 
 Call tmpl_process3.pl --help to get a more detailed explanation. Some
 additional explanations are also available by calling perldoc tmpl_process3.pl.
@@ -20,44 +20,40 @@ HOW TO TRANSLATE Koha:
 
  1. Create your translation file (assuming your current directory is this
     directory, i.e., misc/translator):
-   
-        ./tmpl_process3.pl create -i ../../koha-tmpl/opac-tmpl/default/en/ -s css_opac_fr_FR.po -r
-   
+
+        ./tmpl_process3.pl create -i ../../koha-tmpl/opac-tmpl/default/en/ -s po/css_opac_fr_FR.po -r
+
     (In the above example, ../../koha-tmpl/opac-tmpl/default/en/ contains the
     English templates in the "default" theme, and po/css_opac_fr_FR.po is where
     you want the generated PO file to appear. The use of relative paths for the
-    English templates is recommended but is not necessary; it makes the
-    resulting PO files somewhat easier to read.)
+    English templates is recommended; it makes the resulting PO files slightly
+    shorter and more usable in a team environment. Absolute paths are certainly
+    fine, and might be better if there is only one translator for your
+    language.)
  2. Translate your css_opac_fr_FR.po file using a text editor or a PO file
     translation tool.
  3. Create your translated templates:
-   
-        ./tmpl_process3.pl install -i ../../koha-tmpl/opac-tmpl/default/en/ -o ../../koha-tmpl/opac-tmpl/default/fr2/ -s css_opac_fr_FR.po -r
-   
+
+        ./tmpl_process3.pl install -i ../../koha-tmpl/opac-tmpl/default/en/ -o /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/fr2/ -s po/css_opac_fr_FR.po -r
+
     (In the above example, /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default
     /fr2/ is where you want your translated templates to be saved.)
  4. Copy images/css files in your new directory (as they are NOT moved by
     tmpl_process3.pl install).
 
-If something changes in English version:
+If something changes in the English version:
 
  1. Update your translation file:
-   
-        ./tmpl_process3.pl update -i ../../opac-tmpl/default/en -s po/css_opac_fr_FR.po -r
-   
- 2. Translate your new css_opac_fr_FR.po file. Look for strings marked as
-    "fuzzy" and strings that are not translated.
+
+        ./tmpl_process3.pl update -i ../../koha-tmpl/opac-tmpl/default/en/ -s po/css_opac_fr_FR.po -r
+
+ 2. Translate your newly updated css_opac_fr_FR.po file. Look for strings
+    marked as "fuzzy" and strings that are not translated.
  3. Create your translated templates:
-   
-        ./tmpl_process.pl install -i ../../koha-tmpl/opac-tmpl/default/en/ -o ../../koha-tmpl/opac-tmpl/default/fr2/ -s po/css_opac_fr_FR.po -r
-   
- 4. Copy new images/css files in your new directory if needed
- 
-REBUILD ALL
-===========
-The rebuild_lang.sh script can be used to rebuild all languages officially supported in 2.2 release, when needed.
-Useful for developpers, probably useless for all end-users.
 
+        ./tmpl_process3.pl install -i ../../koha-tmpl/opac-tmpl/default/en/ -o /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/fr2/ -s po/css_opac_fr_FR.po -r
+
+ 4. Copy new images/css files in your new directory if needed
 
 WEAKNESSES
 ==========
@@ -70,4 +66,5 @@ COPYRIGHT
 
   * Paul Poulain (paul.poulain _@_ free.fr) & Jerome Vizcaino (vizcainj _@_
     esiee.fr)
-  * Parts of V3.0 by Ambrose Li (acli _@_ ada.dhs.org)
\ No newline at end of file
+  * Parts of V3.0 by Ambrose Li (acli _@_ ada.dhs.org)
+
diff --git a/misc/translator/xgettext.pl b/misc/translator/xgettext.pl
index a3d65ed847..b793867f29 100755
--- a/misc/translator/xgettext.pl
+++ b/misc/translator/xgettext.pl
@@ -461,8 +461,9 @@ xgettext(1)'s sort option. This will result in translation
 strings inside the generated PO file spuriously moving about
 when tmpl_process3.pl calls msgmerge(1) to update the PO file.
 
-It sometimes generates strings with spurious leading spaces,
+If a Javascript string has leading spaces, it will
+generate strings with spurious leading spaces,
 leading to failure to match the strings when actually generating
-translated files.  The cause of this is not yet known.
+translated files.
 
 =cut
diff --git a/opac/opac-ISBDdetail.pl b/opac/opac-ISBDdetail.pl
index 14ed5f4d00..3f41a2d14b 100755
--- a/opac/opac-ISBDdetail.pl
+++ b/opac/opac-ISBDdetail.pl
@@ -109,7 +109,7 @@ my $res;
 					my @subf = $field->subfields;
 					for my $i (0..$#subf) {
 						my $subfieldcode = $subf[$i][0];
-						my $subfieldvalue = $subf[$i][1];
+						my $subfieldvalue = get_authorised_value_desc($tag, $subf[$i][0], $subf[$i][1], '', $dbh);
 						my $tagsubf = $tag.$subfieldcode;
 						$calculated =~ s/\{(.?.?.?)$tagsubf(.*?)\}/$1$subfieldvalue\{$1$tagsubf$2\}$2/g;
 					}
@@ -140,3 +140,28 @@ $template->param(ISBD => $res,
 
 output_html_with_http_headers $query, $cookie, $template->output;
 
+sub get_authorised_value_desc ($$$$$) {
+   my($tag, $subfield, $value, $framework, $dbh) = @_;
+
+   #---- branch
+    if ($tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "branches" ) {
+       return getbranchname($value);
+    }
+
+   #---- itemtypes
+   if ($tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "itemtypes" ) {
+       return ItemType($value);
+    }
+
+   #---- "true" authorized value
+   my $category = $tagslib->{$tag}->{$subfield}->{'authorised_value'};
+
+   if ($category ne "") {
+       my $sth = $dbh->prepare("select lib from authorised_values where category = ? and authorised_value = ?");
+       $sth->execute($category, $value);
+       my $data = $sth->fetchrow_hashref;
+       return $data->{'lib'};
+   } else {
+       return $value; # if nothing is found return the original value
+   }
+}
diff --git a/opac/opac-MARCdetail.pl b/opac/opac-MARCdetail.pl
index d90b723a36..231e78764d 100755
--- a/opac/opac-MARCdetail.pl
+++ b/opac/opac-MARCdetail.pl
@@ -111,7 +111,7 @@ for (my $tabloop = 0; $tabloop<=10;$tabloop++) {
 				if ($tagslib->{$field->tag()}->{$subf[$i][0]}->{isurl}) {
 					$subfield_data{marc_value}="<a href=\"$subf[$i][1]\">$subf[$i][1]</a>";
 				} else {
-					$subfield_data{marc_value}=$subf[$i][1];
+					$subfield_data{marc_value}=get_authorised_value_desc($field->tag(), $subf[$i][0], $subf[$i][1], '', $dbh);
 				}
 				$subfield_data{marc_subfield}=$subf[$i][0];
 				$subfield_data{marc_tag}=$field->tag();
@@ -180,3 +180,28 @@ $template->param(item_loop => \@item_value_loop,
 						biblionumber => $biblionumber);
 output_html_with_http_headers $query, $cookie, $template->output;
 
+sub get_authorised_value_desc ($$$$$) {
+   my($tag, $subfield, $value, $framework, $dbh) = @_;
+
+   #---- branch
+    if ($tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "branches" ) {
+       return getbranchname($value);
+    }
+
+   #---- itemtypes
+   if ($tagslib->{$tag}->{$subfield}->{'authorised_value'} eq "itemtypes" ) {
+       return ItemType($value);
+    }
+
+   #---- "true" authorized value
+   my $category = $tagslib->{$tag}->{$subfield}->{'authorised_value'};
+
+   if ($category ne "") {
+       my $sth = $dbh->prepare("select lib from authorised_values where category = ? and authorised_value = ?");
+       $sth->execute($category, $value);
+       my $data = $sth->fetchrow_hashref;
+       return $data->{'lib'};
+   } else {
+       return $value; # if nothing is found return the original value
+   }
+}
diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl
index 2ac7dc1df7..689253c9b5 100755
--- a/opac/opac-detail.pl
+++ b/opac/opac-detail.pl
@@ -29,13 +29,13 @@ my $dat                                   = &bibdata($biblionumber);
 my ($authorcount, $addauthor)             = &addauthor($biblionumber);
 my ($webbiblioitemcount, @webbiblioitems) = &getwebbiblioitems($biblionumber);
 my ($websitecount, @websites)             = &getwebsites($biblionumber);
-my $subscriptionid = getsubscriptionfrombiblionumber($biblionumber);
+my $subscriptionsnumber = getsubscriptionfrombiblionumber($biblionumber);
 
 $dat->{'count'}=@items;
 
 $dat->{'additional'}=$addauthor->[0]->{'author'};
 for (my $i = 1; $i < $authorcount; $i++) {
-        $dat->{'additional'} .= "|" . $addauthor->[$i]->{'author'};
+        $dat->{'additional'} .= " ; " . $addauthor->[$i]->{'author'};
 } # for
 
 my $norequests = 1;
@@ -70,7 +70,7 @@ $template->param(BIBLIO_RESULTS => $resultsarray,
 				ITEM_RESULTS => $itemsarray,
 				WEB_RESULTS => $webarray,
 				SITE_RESULTS => $sitearray,
-				subscriptionid => $subscriptionid,
+				subscriptionsnumber => $subscriptionsnumber,
 );
   ## Amazon.com stuff
 =head
@@ -103,3 +103,4 @@ $template->param( REVIEWS => \@reviews );
   ## End of Amazon Stuff
 =cut
 output_html_with_http_headers $query, $cookie, $template->output;
+
diff --git a/opac/opac-reserve.pl b/opac/opac-reserve.pl
index 67a7273674..69ee889964 100755
--- a/opac/opac-reserve.pl
+++ b/opac/opac-reserve.pl
@@ -201,7 +201,7 @@ if ($query->param('item_types_selected')) {
 	}
 	if ($proceed && $branch) {
 		$fee = sprintf "%.02f", $fee;
-		$template->param(fee => $fee);
+		$template->param(fee => $fee,istherefee => $fee>0?1:0);
 		$template->param(item_types_selected => 1);
 	} else {
 		$template->param(message => 1);
@@ -224,11 +224,12 @@ if ($query->param('item_types_selected')) {
 	if ($query->param('all')) {
 		CreateReserve(undef,$branch,$borrowernumber,$biblionumber,'a', undef, $rank,'',$title);
 	}
-	print $query->redirect("/cgi-bin/koha/opac-search.pl");
+	print $query->redirect("/cgi-bin/koha/opac-user.pl");
 } else {
 	# Here we check that the borrower can actually make reserves Stage 1.
 	my $noreserves = 0;
 	my $maxoutstanding = C4::Context->preference("maxoustanding");
+	$template->param(noreserve => 1) unless $maxoutstanding;
 	if ($borr->{'amountoutstanding'} > $maxoutstanding) {
 		my $amount = sprintf "\$%.02f", $borr->{'amountoutstanding'};
 		$template->param(message => 1);
diff --git a/opac/opac-serial-issues.pl b/opac/opac-serial-issues.pl
index fbb0dfb7db..28b88599f6 100755
--- a/opac/opac-serial-issues.pl
+++ b/opac/opac-serial-issues.pl
@@ -17,10 +17,8 @@ my $dbh = C4::Context->dbh;
 my $sth;
 # my $id;
 my ($template, $loggedinuser, $cookie);
-my ($subscriptionid);
-
-$subscriptionid = $query->param('subscriptionid');
-my $subscription = &getsubscription($subscriptionid);
+my $biblionumber = $query->param('biblionumber');
+my $subscriptions = get_subscription_list_from_biblionumber($biblionumber);
 
 ($template, $loggedinuser, $cookie)
 = get_template_and_user({template_name => "opac-serial-issues.tmpl",
@@ -31,27 +29,29 @@ my $subscription = &getsubscription($subscriptionid);
 				});
 
 # replace CR by <br> in librarian note
-$subscription->{opacnote} =~ s/\n/\<br\/\>/g;
+# $subscription->{opacnote} =~ s/\n/\<br\/\>/g;
 
 $template->param(
-	startdate => format_date($subscription->{startdate}),
-	periodicity => $subscription->{periodicity},
-	dow => $subscription->{dow},
-	numberlength => $subscription->{numberlength},
-	weeklength => $subscription->{weeklength},
-	monthlength => $subscription->{monthlength},
-	opacnote => $subscription->{opacnote},
-	numberingmethod => $subscription->{numberingmethod},
-	arrivalplanified => $subscription->{arrivalplanified},
-	status => $subscription->{status},
-	biblionumber => $subscription->{biblionumber},
-	bibliotitle => $subscription->{bibliotitle},
-	notes => $subscription->{notes},
-	subscriptionid => $subscription->{subscriptionid}
+	biblionumber => $query->param('biblionumber'),
+	subscription_LOOP => $subscriptions
+# 	startdate => format_date($subscription->{startdate}),
+# 	periodicity => $subscription->{periodicity},
+# 	dow => $subscription->{dow},
+# 	numberlength => $subscription->{numberlength},
+# 	weeklength => $subscription->{weeklength},
+# 	monthlength => $subscription->{monthlength},
+# 	opacnote => $subscription->{opacnote},
+# 	numberingmethod => $subscription->{numberingmethod},
+# 	arrivalplanified => $subscription->{arrivalplanified},
+# 	status => $subscription->{status},
+# 	biblionumber => $subscription->{biblionumber},
+# 	bibliotitle => $subscription->{bibliotitle},
+# 	notes => $subscription->{notes},
+# 	subscriptionid => $subscription->{subscriptionid}
 	);
-$template->param(
-			"periodicity$subscription->{periodicity}" => 1,
-			"arrival$subscription->{dow}" => 1,
-			);
+# $template->param(
+# 			"periodicity$subscription->{periodicity}" => 1,
+# 			"arrival$subscription->{dow}" => 1,
+# 			);
 
 output_html_with_http_headers $query, $cookie, $template->output;
diff --git a/opac/opac-shelves.pl b/opac/opac-shelves.pl
index 0c0cc9f0cd..26bc355eb7 100755
--- a/opac/opac-shelves.pl
+++ b/opac/opac-shelves.pl
@@ -37,7 +37,7 @@ my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "opac-shelves.tmpl",
 							query => $query,
 							type => "opac",
-							authnotrequired => 0,
+							authnotrequired => 1,
 						});
 
 if ($query->param('modifyshelfcontents')) {
@@ -57,8 +57,7 @@ if ($query->param('modifyshelfcontents')) {
 my ($shelflist) = GetShelfList($loggedinuser,2);
 
 $template->param({	loggedinuser => $loggedinuser,
-					headerbackgroundcolor => $headerbackgroundcolor,
-					circbackgroundcolor => $circbackgroundcolor });
+				});
 SWITCH: {
 	if ($query->param('op') eq 'modifsave') {
 		ModifShelf($query->param('shelfnumber'),$query->param('shelfname'),$loggedinuser,$query->param('category'));
@@ -184,6 +183,9 @@ sub viewshelf {
 
 #
 # $Log$
+# Revision 1.6  2005/03/01 13:41:32  tipaul
+# merging 2.2 branch with head. Sorry for not making it before, many many commits done here
+#
 # Revision 1.5  2005/01/27 17:27:11  oleonard
 # Taking table cell background color information out of the script and moving it into the template (requires update to opac-shelves.tmpl)
 #
diff --git a/plugin_launcher.pl b/plugin_launcher.pl
index e9269c02bc..1cbcd3fd9e 100755
--- a/plugin_launcher.pl
+++ b/plugin_launcher.pl
@@ -29,5 +29,12 @@ use C4::Output;
 my $input = new CGI;
 my $plugin_name=$input->param("plugin_name");
 my $plugin_name="value_builder/".$input->param("plugin_name");
-require $plugin_name;
+
+# opening plugin. Just check wether we are on a developper computer on a production one
+# (the cgidir differs)
+my $cgidir = C4::Context->intranetdir ."/cgi-bin";
+unless (opendir(DIR, "$cgidir/value_builder")) {
+	$cgidir = C4::Context->intranetdir;
+} 
+require $cgidir."/".$plugin_name;
 &plugin($input);
diff --git a/renewscript.pl b/renewscript.pl
index e1e7ce4bc9..80d27500bc 100755
--- a/renewscript.pl
+++ b/renewscript.pl
@@ -63,4 +63,4 @@ if($destination eq "circ"){
 	print $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=$cardnumber");
 } else {
 	print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$bornum");
-}
+}
\ No newline at end of file
diff --git a/reports/manager.pl b/reports/manager.pl
index dc8b8b7ea8..6b1895244c 100755
--- a/reports/manager.pl
+++ b/reports/manager.pl
@@ -41,7 +41,11 @@ my ($template, $borrowernumber, $cookie)
 				});
 $template->param(do_it => $do_it,
 		report_name => $report_name);
-my $plugin = "./".$report_name.".plugin";
+my $cgidir = C4::Context->config('intranetdir')."/cgi-bin/reports/";
+unless (opendir(DIR, "$cgidir")) {
+	$cgidir = C4::Context->intranetdir."/reports/";
+} 
+my $plugin = $cgidir.$report_name.".plugin";
 require $plugin;
 if ($do_it) {
 	my $results = calculate(\@values);
diff --git a/request.pl b/request.pl
index 39ccc269ee..f57540262e 100755
--- a/request.pl
+++ b/request.pl
@@ -142,7 +142,8 @@ foreach my $res (sort {$a->{'found'} cmp $b->{'found'}} @$reserves){
 			$reserve{'atdestination'} = 1;
 		}
     }
-    $reserve{'date'} = format_date($res->{'reservedate'});
+	
+   $reserve{'date'} = format_date($res->{'reservedate'});
 	$reserve{'borrowernumber'}=$res->{'borrowernumber'};
 	$reserve{'biblionumber'}=$res->{'biblionumber'};
 	$reserve{'bornum'}=$res->{'borrowernumber'};
diff --git a/value_builder/unimarc_field_225a.pl b/value_builder/unimarc_field_225a.pl
index c61d88eca9..4e306dfb5d 100644
--- a/value_builder/unimarc_field_225a.pl
+++ b/value_builder/unimarc_field_225a.pl
@@ -118,11 +118,10 @@ my ($input) = @_;
 # builds collection list : search isbn and editor, in parent, then load collections from bibliothesaurus table
 	# if there is an isbn, complete search
 		my @collections;
-	if ($isbn_found) {
 		my $sth = $dbh->prepare("select auth_subfield_table.authid,subfieldvalue from auth_subfield_table 
 						left join auth_header on auth_subfield_table.authid=auth_header.authid 
 						where authtypecode='EDITORS' and tag='200' and subfieldcode='a' and subfieldvalue=?");
-		my $sth2 = $dbh->prepare("select subfieldvalue from auth_subfield_table where tag='200' and subfieldcode='c' and authid=?");
+		my $sth2 = $dbh->prepare("select subfieldvalue from auth_subfield_table where tag='200' and subfieldcode='c' and authid=? order by subfieldvalue");
 		my @splited = split //, $isbn_found;
 		my $isbn_rebuild='';
 		foreach my $x (@splited) {
@@ -134,14 +133,6 @@ my ($input) = @_;
 				push @collections,$line;
 			}
 		}
-	} else {
-	# if there is no isbn, search with %
-		my $sth = $dbh->prepare("select stdlib from bibliothesaurus where father like ? and category='EDITORS' order by stdlib");
-		$sth->execute("\%$authoritysep $editor_found $authoritysep");
-		while (my ($line)= $sth->fetchrow) {
-			push @collections,$line;
-		}
-	}
 #	my @collections = ["test"];
 	my $collection =CGI::scrolling_list(-name=>'f1',
 												-values=> \@collections,
-- 
2.20.1