Merge remote-tracking branch 'origin/new/bug_7936'
authorPaul Poulain <paul.poulain@biblibre.com>
Sun, 10 Jun 2012 08:41:34 +0000 (10:41 +0200)
committerChris Cormack <chrisc@catalyst.net.nz>
Sun, 10 Jun 2012 14:01:44 +0000 (02:01 +1200)
commitac49bd90227bca9a23fb8a4455d1750bc23baacc
tree6295fdf7718644a8373b0f93499c97509f3bee6d
parentee3ffc006cd574eae85c8cd20d885133a9ffde3a
Merge remote-tracking branch 'origin/new/bug_7936'
57 files changed:
koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/acqcontract.tt
koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/acqui-home.tt
koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basket.tt
koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basketgroup.tt
koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basketheader.tt
koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/booksellers.tt
koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/histsearch.tt
koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/lateorders.tt
koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/neworderbiblio.tt
koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/neworderempty.tt
koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/newordersuggestion.tt
koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/orderreceive.tt
koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/parcel.tt
koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/parcels.tt
koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/supplier.tt
koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/z3950_search.tt
koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/admin-home.tt
koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudgetperiods.tt
koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudgets.tt
koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqplan.tt
koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tt
koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_tag_structure.tt
koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/authorised_values.tt
koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/authtypes.tt
koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/biblio_framework.tt
koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branch_transfer_limits.tt
koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branches.tt
koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/categorie.tt
koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/checkmarc.tt
koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/cities.tt
koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/classsources.tt
koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/currency.tt
koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/fieldmapping.tt
koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/item_circulation_alerts.tt
koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/itemtypes.tt
koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/koha2marclinks.tt
koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marc_subfields_structure.tt
koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marctagstructure.tt
koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/matching-rules.tt
koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/oai_set_mappings.tt
koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/oai_sets.tt
koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/patron-attr-types.tt
koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/preferences.tt
koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/printers.tt
koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/roadtype.tt
koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/smart-rules.tt
koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/stopwords.tt
koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/z3950servers.tt
koha-tmpl/intranet-tmpl/prog/en/modules/help/offline_circ/process_koc.tt
koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/checkexpiration.tt
koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/claims.tt
koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/routing.tt
koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/serials-collection.tt
koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/serials-edit.tt
koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/serials-home.tt
koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/subscription-add.tt
koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/subscription-detail.tt