Attachment 84463 Details for Bug 5770 – Bug 5770: (QA follow-up) Minor formatting fixes

[patch] Bug 5770: (QA follow-up) Minor formatting fixes

Bug-5770-QA-follow-up-Minor-formatting-fixes.patch (text/plain), 106.92 KB, created by Katrin Fischer on 2019-01-27 12:56:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2019-01-27 12:56:01 UTC

Size: 106.92 KB

patch

obsolete

>From 702fe6b532e153aa1cc59b1e90208274e3da8215 Mon Sep 17 00:00:00 2001
>From: Katrin Fischer <katrin.fischer.83@web.de>
>Date: Sun, 27 Jan 2019 13:54:29 +0100
>Subject: [PATCH] Bug 5770: (QA follow-up) Minor formatting fixes
>
>- Rewords system preference slightly
>- Minor changes to the sample template like
>  " : " to ": "
>- Alphabetizes sysprefs.sql
>---
> .../data/mysql/atomicupdate/bug_5770.sql      | 28 +++----
> .../mysql/de-DE/mandatory/sample_notices.sql  | 28 +++----
> .../mysql/en/mandatory/sample_notices.sql     | 32 ++++----
> .../mysql/es-ES/mandatory/sample_notices.sql  | 34 ++++----
> .../fr-CA/obligatoire/sample_notices.sql      | 80 +++++++++----------
> .../fr-FR/1-Obligatoire/sample_notices.sql    | 50 ++++++------
> .../data/mysql/it-IT/necessari/notices.sql    | 36 ++++-----
> .../nb-NO/1-Obligatorisk/sample_notices.sql   | 34 ++++----
> .../mysql/pl-PL/mandatory/sample_notices.sql  | 34 ++++----
> .../mysql/ru-RU/mandatory/sample_notices.sql  | 34 ++++----
> installer/data/mysql/sysprefs.sql             |  4 +-
> .../mysql/uk-UA/mandatory/sample_notices.sql  | 28 +++----
> .../en/modules/admin/preferences/admin.pref   |  4 +-
> 13 files changed, 213 insertions(+), 213 deletions(-)
>
>diff --git a/installer/data/mysql/atomicupdate/bug_5770.sql b/installer/data/mysql/atomicupdate/bug_5770.sql
>index 0d27abf343..7537972bcb 100644
>--- a/installer/data/mysql/atomicupdate/bug_5770.sql
>+++ b/installer/data/mysql/atomicupdate/bug_5770.sql
>@@ -3,7 +3,7 @@ INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) V
> ('EmailAddressForSuggestions','','','If you choose EmailAddressForSuggestions you should enter a valid email address','free');
> 
> INSERT IGNORE INTO `letter` (module, code, name, title, content, is_html, message_transport_type)
>-VALUES ('suggestions','NEW_SUGGESTION','New suggestion','New Suggestion','<h3> Suggestion pending approval</h3>
>+VALUES ('suggestions','NEW_SUGGESTION','New suggestion','New suggestion','<h3>Suggestion pending approval</h3>
> <p><h4>Suggested by</h4>
>  <ul>
>    <li><<borrowers.firstname>> <<borrowers.surname>></li>
>@@ -12,19 +12,19 @@ VALUES ('suggestions','NEW_SUGGESTION','New suggestion','New Suggestion','<h3> S
>    <li><<borrowers.email>></li>
>  </ul>
> </p>
>-<p><h4>Item on suggestion</h4>
>+<p><h4>Title suggested</h4>
>  <ul>
>-   <li><b>Library : </b> <<branches.branchname>></li>
>-   <li><b>Title : </b> <<suggestions.title>></li>
>-   <li><b>Author : </b> <<suggestions.author>></li>
>-   <li><b>Copyright date : </b> <<suggestions.copyrightdate>></li>
>-   <li><b>Standard number (ISBN, ISSN or other) : </b> <<suggestions.isbn>></li>
>-   <li><b>Publisher : </b> <<suggestions.publishercode>></li>
>-   <li><b>Collection title : </b> <<suggestions.collectiontitle>></li>
>-   <li><b>Publication place : </b> <<suggestions.place>></li>
>-   <li><b>Quantity : </b> <<suggestions.quantity>></li>
>-   <li><b>Item type : </b>  <<suggestions.itemtype>></li>
>-   <li><b>Reason for suggestion : </b> <<suggestions.patronreason>></li>
>-   <li><b>Notes : </b> <<suggestions.note>></li>
>+   <li><b>Library:</b> <<branches.branchname>></li>
>+   <li><b>Title:</b> <<suggestions.title>></li>
>+   <li><b>Author:</b> <<suggestions.author>></li>
>+   <li><b>Copyright date:</b> <<suggestions.copyrightdate>></li>
>+   <li><b>Standard number (ISBN, ISSN or other):</b> <<suggestions.isbn>></li>
>+   <li><b>Publisher:</b> <<suggestions.publishercode>></li>
>+   <li><b>Collection title:</b> <<suggestions.collectiontitle>></li>
>+   <li><b>Publication place:</b> <<suggestions.place>></li>
>+   <li><b>Quantity:</b> <<suggestions.quantity>></li>
>+   <li><b>Item type:</b> <<suggestions.itemtype>></li>
>+   <li><b>Reason for suggestion:</b> <<suggestions.patronreason>></li>
>+   <li><b>Notes:</b> <<suggestions.note>></li>
>  </ul>
> </p>',1, 'email');
>diff --git a/installer/data/mysql/de-DE/mandatory/sample_notices.sql b/installer/data/mysql/de-DE/mandatory/sample_notices.sql
>index e474592c2e..3368fbbd98 100644
>--- a/installer/data/mysql/de-DE/mandatory/sample_notices.sql
>+++ b/installer/data/mysql/de-DE/mandatory/sample_notices.sql
>@@ -22,7 +22,7 @@ VALUES ('circulation','ODUE','Mahnung','Mahnung','Liebe/r <<borrowers.firstname>
> ('suggestions','TO_PROCESS','Benachrichtigung an Besitzer des Kontos', 'Anschaffungsvorschlag wartet auf Bearbeitung','Liebe(r) <<borrowers.firstname>> <<borrowers.surname>>,\n\nEin neuer Anschaffungsvorschlag wartet auf Bearbeitung: <<suggestions.title>> von <<suggestions.author>>.\n\nVielen Dank,\n\n<<branches.branchname>>', 'email');
> 
> INSERT INTO `letter` (module, code, name, title, content, is_html, message_transport_type)
>-VALUES ('suggestions','NEW_SUGGESTION','New suggestion','New Suggestion','<h3> Suggestion pending approval</h3>
>+VALUES ('suggestions','NEW_SUGGESTION','New suggestion','New suggestion','<h3>Suggestion pending approval</h3>
> <p><h4>Suggested by</h4>
>  <ul>
>    <li><<borrowers.firstname>> <<borrowers.surname>></li>
>@@ -31,20 +31,20 @@ VALUES ('suggestions','NEW_SUGGESTION','New suggestion','New Suggestion','<h3> S
>    <li><<borrowers.email>></li>
>  </ul>
> </p>
>-<p><h4>Item on suggestion</h4>
>+<p><h4>Title suggested</h4>
>  <ul>
>-   <li><b>Library : </b> <<branches.branchname>></li>
>-   <li><b>Title : </b> <<suggestions.title>></li>
>-   <li><b>Author : </b> <<suggestions.author>></li>
>-   <li><b>Copyright date : </b> <<suggestions.copyrightdate>></li>
>-   <li><b>Standard number (ISBN, ISSN or other) : </b> <<suggestions.isbn>></li>
>-   <li><b>Publisher : </b> <<suggestions.publishercode>></li>
>-   <li><b>Collection title : </b> <<suggestions.collectiontitle>></li>
>-   <li><b>Publication place : </b> <<suggestions.place>></li>
>-   <li><b>Quantity : </b> <<suggestions.quantity>></li>
>-   <li><b>Item type : </b>  <<suggestions.itemtype>></li>
>-   <li><b>Reason for suggestion : </b> <<suggestions.patronreason>></li>
>-   <li><b>Notes : </b> <<suggestions.note>></li>
>+   <li><b>Library:</b> <<branches.branchname>></li>
>+   <li><b>Title:</b> <<suggestions.title>></li>
>+   <li><b>Author:</b> <<suggestions.author>></li>
>+   <li><b>Copyright date:</b> <<suggestions.copyrightdate>></li>
>+   <li><b>Standard number (ISBN, ISSN or other):</b> <<suggestions.isbn>></li>
>+   <li><b>Publisher:</b> <<suggestions.publishercode>></li>
>+   <li><b>Collection title:</b> <<suggestions.collectiontitle>></li>
>+   <li><b>Publication place:</b> <<suggestions.place>></li>
>+   <li><b>Quantity:</b> <<suggestions.quantity>></li>
>+   <li><b>Item type:</b>  <<suggestions.itemtype>></li>
>+   <li><b>Reason for suggestion:</b> <<suggestions.patronreason>></li>
>+   <li><b>Notes:</b> <<suggestions.note>></li>
>  </ul>
> </p>',1, 'email');
> 
>diff --git a/installer/data/mysql/en/mandatory/sample_notices.sql b/installer/data/mysql/en/mandatory/sample_notices.sql
>index 7551a2b796..0732cad9ea 100644
>--- a/installer/data/mysql/en/mandatory/sample_notices.sql
>+++ b/installer/data/mysql/en/mandatory/sample_notices.sql
>@@ -13,16 +13,16 @@ VALUES ('circulation','ODUE','Overdue Notice','Item Overdue','Dear <<borrowers.f
> ('reserves', 'HOLD', 'Hold Available for Pickup', 'Hold Available for Pickup (print notice)', '<<branches.branchname>>\r\n<<branches.branchaddress1>>\r\n<<branches.branchaddress2>>\r\n\r\n\r\nChange Service Requested\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<<borrowers.firstname>> <<borrowers.surname>>\r\n<<borrowers.address>>\r\n<<borrowers.city>> <<borrowers.zipcode>>\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<<borrowers.firstname>> <<borrowers.surname>> <<borrowers.cardnumber>>\r\n\r\nYou have a hold available for pickup as of <<reserves.waitingdate>>:\r\n\r\nTitle: <<biblio.title>>\r\nAuthor: <<biblio.author>>\r\nCopy: <<items.copynumber>>\r\n', 'print'),
> ('circulation','CHECKIN','Item Check-in (Digest)','Check-ins','The following items have been checked in:\r\n----\r\n[% biblio.title %]\r\n----\r\nThank you.', 'email'),
> ('circulation','CHECKOUT','Item Check-out (Digest)','Checkouts','The following items have been checked out:\r\n----\r\n[% biblio.title %]\r\n----\r\nThank you for visiting [% branch.branchname %].', 'email'),
>-('reserves', 'HOLDPLACED', 'Hold Placed on Item', 'Hold Placed on Item','A hold has been placed on the following item : <<biblio.title>> (<<biblio.biblionumber>>) by the user <<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>).', 'email'),
>+('reserves', 'HOLDPLACED', 'Hold Placed on Item', 'Hold Placed on Item','A hold has been placed on the following item:<<biblio.title>> (<<biblio.biblionumber>>) by the user <<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>).', 'email'),
> ('reserves', 'CANCEL_HOLD_ON_LOST', 'Hold has been cancelled', "Hold has been cancelled", "Dear [% borrower.firstname %] [% borrower.surname %],\n\nWe regret to inform you, that the following item can not be provided due to it being missing. Your hold was cancelled.\n\nTitle: [% biblio.title %]\nAuthor: [% biblio.author %]\nCopy: [% item.copynumber %]\nLocation: [% branch.branchname %]", 'email'),
> ('suggestions','ACCEPTED','Suggestion accepted', 'Purchase suggestion accepted','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nThe library has reviewed your suggestion today. The item will be ordered as soon as possible. You will be notified by mail when the order is completed, and again when the item arrives at the library.\n\nIf you have any questions, please email us at <<branches.branchemail>>.\n\nThank you,\n\n<<branches.branchname>>', 'email'),
> ('suggestions','AVAILABLE','Suggestion available', 'Suggested purchase available','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nWe are pleased to inform you that the item you requested is now part of the collection.\n\nIf you have any questions, please email us at <<branches.branchemail>>.\n\nThank you,\n\n<<branches.branchname>>', 'email'),
> ('suggestions','ORDERED','Suggestion ordered', 'Suggested item ordered','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nWe are pleased to inform you that the item you requested has now been ordered. It should arrive soon, at which time it will be processed for addition into the collection.\n\nYou will be notified again when the book is available.\n\nIf you have any questions, please email us at <<branches.branchemail>>\n\nThank you,\n\n<<branches.branchname>>', 'email'),
> ('suggestions','REJECTED','Suggestion rejected', 'Purchase suggestion declined','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nThe library has reviewed your request today, and has decided not to accept the suggestion at this time.\n\nThe reason given is: <<suggestions.reason>>\n\nIf you have any questions, please email us at <<branches.branchemail>>.\n\nThank you,\n\n<<branches.branchname>>', 'email'),
>-('suggestions','TO_PROCESS','Notify fund owner', 'A suggestion is ready to be processed','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nA new suggestion is ready to be processed: <<suggestions.title>> by <<suggestions.author>>.\n\nThank you,\n\n<<branches.branchname>>', 'email');
>+('suggestions','TO_PROCESS','Notify fund owner', 'A suggestion is ready to be processed','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nA New suggestion is ready to be processed: <<suggestions.title>> by <<suggestions.author>>.\n\nThank you,\n\n<<branches.branchname>>', 'email');
> 
> INSERT INTO `letter` (module, code, name, title, content, is_html, message_transport_type)
>-VALUES ('suggestions','NEW_SUGGESTION','New suggestion','New Suggestion','<h3> Suggestion pending approval</h3>
>+VALUES ('suggestions','NEW_SUGGESTION','New suggestion','New suggestion','<h3>Suggestion pending approval</h3>
> <p><h4>Suggested by</h4>
>  <ul>
>    <li><<borrowers.firstname>> <<borrowers.surname>></li>
>@@ -31,20 +31,20 @@ VALUES ('suggestions','NEW_SUGGESTION','New suggestion','New Suggestion','<h3> S
>    <li><<borrowers.email>></li>
>  </ul>
> </p>
>-<p><h4>Item on suggestion</h4>
>+<p><h4>Title suggested</h4>
>  <ul>
>-   <li><b>Library : </b> <<branches.branchname>></li>
>-   <li><b>Title : </b> <<suggestions.title>></li>
>-   <li><b>Author : </b> <<suggestions.author>></li>
>-   <li><b>Copyright date : </b> <<suggestions.copyrightdate>></li>
>-   <li><b>Standard number (ISBN, ISSN or other) : </b> <<suggestions.isbn>></li>
>-   <li><b>Publisher : </b> <<suggestions.publishercode>></li>
>-   <li><b>Collection title : </b> <<suggestions.collectiontitle>></li>
>-   <li><b>Publication place : </b> <<suggestions.place>></li>
>-   <li><b>Quantity : </b> <<suggestions.quantity>></li>
>-   <li><b>Item type : </b>  <<suggestions.itemtype>></li>
>-   <li><b>Reason for suggestion : </b> <<suggestions.patronreason>></li>
>-   <li><b>Notes : </b> <<suggestions.note>></li>
>+   <li><b>Library:</b> <<branches.branchname>></li>
>+   <li><b>Title:</b> <<suggestions.title>></li>
>+   <li><b>Author:</b> <<suggestions.author>></li>
>+   <li><b>Copyright date:</b> <<suggestions.copyrightdate>></li>
>+   <li><b>Standard number (ISBN, ISSN or other):</b> <<suggestions.isbn>></li>
>+   <li><b>Publisher:</b> <<suggestions.publishercode>></li>
>+   <li><b>Collection title:</b> <<suggestions.collectiontitle>></li>
>+   <li><b>Publication place:</b> <<suggestions.place>></li>
>+   <li><b>Quantity:</b> <<suggestions.quantity>></li>
>+   <li><b>Item type:</b>  <<suggestions.itemtype>></li>
>+   <li><b>Reason for suggestion:</b> <<suggestions.patronreason>></li>
>+   <li><b>Notes:</b> <<suggestions.note>></li>
>  </ul>
> </p>',1, 'email');
> 
>diff --git a/installer/data/mysql/es-ES/mandatory/sample_notices.sql b/installer/data/mysql/es-ES/mandatory/sample_notices.sql
>index 2f45cd84c7..4e09a52ca1 100644
>--- a/installer/data/mysql/es-ES/mandatory/sample_notices.sql
>+++ b/installer/data/mysql/es-ES/mandatory/sample_notices.sql
>@@ -12,17 +12,17 @@ VALUES ('circulation','ODUE','Overdue Notice','Item Overdue','Dear <<borrowers.f
> ('reserves', 'HOLD', 'Hold Available for Pickup', 'Hold Available for Pickup (print notice)', '<<branches.branchname>>\r\n<<branches.branchaddress1>>\r\n<<branches.branchaddress2>>\r\n\r\n\r\nChange Service Requested\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<<borrowers.firstname>> <<borrowers.surname>>\r\n<<borrowers.address>>\r\n<<borrowers.city>> <<borrowers.zipcode>>\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<<borrowers.firstname>> <<borrowers.surname>> <<borrowers.cardnumber>>\r\n\r\nYou have a hold available for pickup as of <<reserves.waitingdate>>:\r\n\r\nTitle: <<biblio.title>>\r\nAuthor: <<biblio.author>>\r\nCopy: <<items.copynumber>>\r\n', 'print'),
> ('circulation','CHECKIN','Item Check-in (Digest)','Check-ins','The following items have been checked in:\r\n----\r\n[% biblio.title %]\r\n----\r\nThank you.', 'email'),
> ('circulation','CHECKOUT','Item Check-out (Digest)','Checkouts','The following items have been checked out:\r\n----\r\n[% biblio.title %]\r\n----\r\nThank you for visiting [% branch.branchname %].', 'email'),
>-('reserves', 'HOLDPLACED', 'Hold Placed on Item', 'Hold Placed on Item','A hold has been placed on the following item : <<biblio.title>> (<<biblio.biblionumber>>) by the user <<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>).', 'email'),
>+('reserves', 'HOLDPLACED', 'Hold Placed on Item', 'Hold Placed on Item','A hold has been placed on the following item:<<biblio.title>> (<<biblio.biblionumber>>) by the user <<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>).', 'email'),
> ('reserves', 'CANCEL_HOLD_ON_LOST', 'Hold has been cancelled', "Hold has been cancelled", "Dear [% borrower.firstname %] [% borrower.surname %],\n\nWe regret to inform you, that the following item can not be provided due to it being missing. Your hold was cancelled.\n\nTitle: [% biblio.title %]\nAuthor: [% biblio.author %]\nCopy: [% item.copynumber %]\nLocation: [% branch.branchname %]", 'email'),
> ('suggestions','ACCEPTED','Suggestion accepted', 'Purchase suggestion accepted','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nThe library has reviewed your suggestion today. The item will be ordered as soon as possible. You will be notified by mail when the order is completed, and again when the item arrives at the library.\n\nIf you have any questions, please email us at <<branches.branchemail>>.\n\nThank you,\n\n<<branches.branchname>>', 'email'),
> ('suggestions','AVAILABLE','Suggestion available', 'Suggested purchase available','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nWe are pleased to inform you that the item you requested is now part of the collection.\n\nIf you have any questions, please email us at <<branches.branchemail>>.\n\nThank you,\n\n<<branches.branchname>>', 'email'),
> ('suggestions','ORDERED','Suggestion ordered', 'Suggested item ordered','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nWe are pleased to inform you that the item you requested has now been ordered. It should arrive soon, at which time it will be processed for addition into the collection.\n\nYou will be notified again when the book is available.\n\nIf you have any questions, please email us at <<branches.branchemail>>\n\nThank you,\n\n<<branches.branchname>>', 'email'),
> ('suggestions','REJECTED','Suggestion rejected', 'Purchase suggestion declined','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nThe library has reviewed your request today, and has decided not to accept the suggestion at this time.\n\nThe reason given is: <<suggestions.reason>>\n\nIf you have any questions, please email us at <<branches.branchemail>>.\n\nThank you,\n\n<<branches.branchname>>', 'email'),
>-('suggestions','TO_PROCESS','Notify fund owner', 'A suggestion is ready to be processed','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nA new suggestion is ready to be processed: <<suggestions.title>> by <<suggestions.author>>.\n\nThank you,\n\n<<branches.branchname>>', 'email'),
>-('members', 'DISCHARGE', 'Discharge', 'Discharge for <<borrowers.firstname>> <<borrowers.surname>>', '<h1>Discharge</h1>\r\n\r\nThe library <<borrowers.branchcode>> certifies that the following borrower :\r\n\r\n    <<borrowers.firstname>> <<borrowers.surname>>\r\n   Cardnumber : <<borrowers.cardnumber>>\r\n\r\nreturned all his documents.', 'email');
>+('suggestions','TO_PROCESS','Notify fund owner', 'A suggestion is ready to be processed','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nA New suggestion is ready to be processed: <<suggestions.title>> by <<suggestions.author>>.\n\nThank you,\n\n<<branches.branchname>>', 'email'),
>+('members', 'DISCHARGE', 'Discharge', 'Discharge for <<borrowers.firstname>> <<borrowers.surname>>', '<h1>Discharge</h1>\r\n\r\nThe library <<borrowers.branchcode>> certifies that the following borrower :\r\n\r\n    <<borrowers.firstname>> <<borrowers.surname>>\r\n   Cardnumber:<<borrowers.cardnumber>>\r\n\r\nreturned all his documents.', 'email');
> 
> INSERT INTO `letter` (module, code, name, title, content, is_html, message_transport_type)
>-VALUES ('suggestions','NEW_SUGGESTION','New suggestion','New Suggestion','<h3> Suggestion pending approval</h3>
>+VALUES ('suggestions','NEW_SUGGESTION','New suggestion','New suggestion','<h3>Suggestion pending approval</h3>
> <p><h4>Suggested by</h4>
>  <ul>
>    <li><<borrowers.firstname>> <<borrowers.surname>></li>
>@@ -31,20 +31,20 @@ VALUES ('suggestions','NEW_SUGGESTION','New suggestion','New Suggestion','<h3> S
>    <li><<borrowers.email>></li>
>  </ul>
> </p>
>-<p><h4>Item on suggestion</h4>
>+<p><h4>Title suggested</h4>
>  <ul>
>-   <li><b>Library : </b> <<branches.branchname>></li>
>-   <li><b>Title : </b> <<suggestions.title>></li>
>-   <li><b>Author : </b> <<suggestions.author>></li>
>-   <li><b>Copyright date : </b> <<suggestions.copyrightdate>></li>
>-   <li><b>Standard number (ISBN, ISSN or other) : </b> <<suggestions.isbn>></li>
>-   <li><b>Publisher : </b> <<suggestions.publishercode>></li>
>-   <li><b>Collection title : </b> <<suggestions.collectiontitle>></li>
>-   <li><b>Publication place : </b> <<suggestions.place>></li>
>-   <li><b>Quantity : </b> <<suggestions.quantity>></li>
>-   <li><b>Item type : </b>  <<suggestions.itemtype>></li>
>-   <li><b>Reason for suggestion : </b> <<suggestions.patronreason>></li>
>-   <li><b>Notes : </b> <<suggestions.note>></li>
>+   <li><b>Library:</b> <<branches.branchname>></li>
>+   <li><b>Title:</b> <<suggestions.title>></li>
>+   <li><b>Author:</b> <<suggestions.author>></li>
>+   <li><b>Copyright date:</b> <<suggestions.copyrightdate>></li>
>+   <li><b>Standard number (ISBN, ISSN or other):</b> <<suggestions.isbn>></li>
>+   <li><b>Publisher:</b> <<suggestions.publishercode>></li>
>+   <li><b>Collection title:</b> <<suggestions.collectiontitle>></li>
>+   <li><b>Publication place:</b> <<suggestions.place>></li>
>+   <li><b>Quantity:</b> <<suggestions.quantity>></li>
>+   <li><b>Item type:</b>  <<suggestions.itemtype>></li>
>+   <li><b>Reason for suggestion:</b> <<suggestions.patronreason>></li>
>+   <li><b>Notes:</b> <<suggestions.note>></li>
>  </ul>
> </p>',1, 'email');
> 
>diff --git a/installer/data/mysql/fr-CA/obligatoire/sample_notices.sql b/installer/data/mysql/fr-CA/obligatoire/sample_notices.sql
>index 2e2862fcaf..f7833a0862 100644
>--- a/installer/data/mysql/fr-CA/obligatoire/sample_notices.sql
>+++ b/installer/data/mysql/fr-CA/obligatoire/sample_notices.sql
>@@ -3,29 +3,29 @@ INSERT INTO `letter` (module, code, branchcode, name, is_html, title, content, m
> ('circulation','CHECKOUT','','Emprunts (RÃ©sumÃ©)',0,'Emprunts','Bonjour <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nVous venez d\'emprunter les documents suivants :\r\n----\r\n<<biblio.title>>\r\n----\r\nMerci.\r\n\r\n<<branches.branchname>>','email'),
> ('circulation','DUE','','Document Ã  rendre aujourd\'hui',0,'Document Ã  rendre aujourd\'hui','Bonjour <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nLe prÃªt de ce document arrive Ã  expiration aujourd\'hui.\r\n\r\n<<biblio.title>>, <<biblio.author>> (<<items.barcode>>)\r\n\r\nMerci de nous le retourner.\r\n\r\n<<branches.branchname>>','email'),
> ('circulation','DUEDGST','','Document Ã  rendre aujourd\'hui (RÃ©sumÃ©)',0,'Document Ã  rendre aujourd\'hui','Bonjour <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nVous avez <<count>> document(s) dont le prÃªt arrive Ã  expiration.\r\n\r\nMerci de nous le(s) retourner rapidement.\r\n\r\n<<branches.branchname>>','email'),
>-('circulation','ISSUEQSLIP','','Ticket rapide de prÃªts',1,'Ticket rapide de prÃªts','<h3><<branches.branchname>></h3>\r\nEmpruntÃ© par <<borrowers.firstname>> <<borrowers.surname>> <br />\r\n(<<borrowers.cardnumber>>) <br />\r\n\r\n<<today>><br />\r\n\r\n<h4>EmpruntÃ©(s) aujourd\'hui</h4>\r\n<checkedout>\r\n<p>\r\n<<biblio.title>><br />\r\nCode-barres : <<items.barcode>><br />\r\nDate de retour : <<issues.date_due>><br />\r\n</p>\r\n</checkedout>','email'),
>-('circulation','ISSUESLIP','','Ticket de prÃªts',1,'Ticket de prÃªts','<h3><<branches.branchname>></h3>\r\nEmpruntÃ© par <<borrowers.firstname>> <<borrowers.surname>> <br />\r\n(<<borrowers.cardnumber>>) <br />\r\n\r\n<<today>><br />\r\n\r\n<h4>EmpruntÃ©(s) aujourd\'hui</h4>\r\n<checkedout>\r\n<p>\r\n<<biblio.title>> <br />\r\nCode-barres : <<items.barcode>><br />\r\nDate de retour : <<issues.date_due>><br />\r\n</p>\r\n</checkedout>\r\n\r\n<h4>Retards</h4>\r\n<overdue>\r\n<p>\r\n<<biblio.title>> <br />\r\nCode-barres : <<items.barcode>><br />\r\nDate de retour : <<issues.date_due>><br />\r\n</p>\r\n</overdue>\r\n\r\n<hr>\r\n\r\n<h4 style=\"text-align: center; font-style:italic;\">Nouvelles</h4>\r\n<news>\r\n<div class=\"newsitem\">\r\n<h5 style=\"margin-bottom: 1px; margin-top: 1px\"><b><<opac_news.title>></b></h5>\r\n<p style=\"margin-bottom: 1px; margin-top: 1px\"><<opac_news.content>></p>\r\n<p class=\"newsfooter\" style=\"font-size: 8pt; font-style:italic; margin-bottom: 1px; margin-top: 1px\">PubliÃ©e le <<opac_news.timestamp>></p>\r\n<hr />\r\n</div>\r\n</news>','email'),
>-('circulation','ODUE','','Document(s) en retard',0,'Document(s) en retard','Bonjour <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nSelon nos informations, vous avez au moins un document en retard. Merci de retourner ou renouveller ce ou ces documents dans votre bibliothÃ¨que le plus rapidement possible.\r\n\r\n<<branches.branchname>>\r\n<<branches.branchaddress1>>\r\n<<branches.branchaddress2>> <<branches.branchaddress3>>\r\nTÃ©l : <<branches.branchphone>>\r\nFax : <<branches.branchfax>>\r\nCourriel : <<branches.branchemail>>\r\n\r\nSi vous avez le mot de passe de votre compte lecteur, vous pouvez renouveler directement en ligne. Sinon, merci de nous contacter.\r\n\r\nLe ou les documents suivants sont en retard :\r\n\r\n<item>\"<<biblio.title>>\" par <<biblio.author>>, <<items.itemcallnumber>>, code-barres : <<items.barcode>> Amende : <<items.fine>></item>\r\n\r\nMerci de votre attention.\r\n\r\n<<branches.branchname>>','email'),
>+('circulation','ISSUEQSLIP','','Ticket rapide de prÃªts',1,'Ticket rapide de prÃªts','<h3><<branches.branchname>></h3>\r\nEmpruntÃ© par <<borrowers.firstname>> <<borrowers.surname>> <br />\r\n(<<borrowers.cardnumber>>) <br />\r\n\r\n<<today>><br />\r\n\r\n<h4>EmpruntÃ©(s) aujourd\'hui</h4>\r\n<checkedout>\r\n<p>\r\n<<biblio.title>><br />\r\nCode-barres:<<items.barcode>><br />\r\nDate de retour:<<issues.date_due>><br />\r\n</p>\r\n</checkedout>','email'),
>+('circulation','ISSUESLIP','','Ticket de prÃªts',1,'Ticket de prÃªts','<h3><<branches.branchname>></h3>\r\nEmpruntÃ© par <<borrowers.firstname>> <<borrowers.surname>> <br />\r\n(<<borrowers.cardnumber>>) <br />\r\n\r\n<<today>><br />\r\n\r\n<h4>EmpruntÃ©(s) aujourd\'hui</h4>\r\n<checkedout>\r\n<p>\r\n<<biblio.title>> <br />\r\nCode-barres:<<items.barcode>><br />\r\nDate de retour:<<issues.date_due>><br />\r\n</p>\r\n</checkedout>\r\n\r\n<h4>Retards</h4>\r\n<overdue>\r\n<p>\r\n<<biblio.title>> <br />\r\nCode-barres:<<items.barcode>><br />\r\nDate de retour:<<issues.date_due>><br />\r\n</p>\r\n</overdue>\r\n\r\n<hr>\r\n\r\n<h4 style=\"text-align: center; font-style:italic;\">Nouvelles</h4>\r\n<news>\r\n<div class=\"newsitem\">\r\n<h5 style=\"margin-bottom: 1px; margin-top: 1px\"><b><<opac_news.title>></b></h5>\r\n<p style=\"margin-bottom: 1px; margin-top: 1px\"><<opac_news.content>></p>\r\n<p class=\"newsfooter\" style=\"font-size: 8pt; font-style:italic; margin-bottom: 1px; margin-top: 1px\">PubliÃ©e le <<opac_news.timestamp>></p>\r\n<hr />\r\n</div>\r\n</news>','email'),
>+('circulation','ODUE','','Document(s) en retard',0,'Document(s) en retard','Bonjour <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nSelon nos informations, vous avez au moins un document en retard. Merci de retourner ou renouveller ce ou ces documents dans votre bibliothÃ¨que le plus rapidement possible.\r\n\r\n<<branches.branchname>>\r\n<<branches.branchaddress1>>\r\n<<branches.branchaddress2>> <<branches.branchaddress3>>\r\nTÃ©l:<<branches.branchphone>>\r\nFax:<<branches.branchfax>>\r\nCourriel:<<branches.branchemail>>\r\n\r\nSi vous avez le mot de passe de votre compte lecteur, vous pouvez renouveler directement en ligne. Sinon, merci de nous contacter.\r\n\r\nLe ou les documents suivants sont en retard :\r\n\r\n<item>\"<<biblio.title>>\" par <<biblio.author>>, <<items.itemcallnumber>>, code-barres:<<items.barcode>> Amende:<<items.fine>></item>\r\n\r\nMerci de votre attention.\r\n\r\n<<branches.branchname>>','email'),
> ('circulation','PREDUE','','Document Ã  rendre bientÃ´t',0,'Document Ã  rendre bientÃ´t','Bonjour <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nNous souhaitons vous informer que le prÃªt de ce document arrive bientÃ´t Ã  expiration :\r\n\r\n<<biblio.title>>, <<biblio.author>> (<<items.barcode>>)\r\n\r\nMerci.\r\n\r\n<<branches.branchname>>','email'),
> ('circulation','PREDUEDGST','','Document Ã  rendre bientÃ´t (RÃ©sumÃ©)',0,'Document(s) Ã  rendre bientÃ´t','Bonjour <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nVous avez <<count>> document(s) dont le prÃªt arrive bientÃ´t Ã  expiration.\r\n\r\n<<branches.branchname>>','email'),
> ('circulation','RENEWAL','','Renouvellements',0,'Renouvellements','Bonjour <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nVous avez renouvelÃ© les documents suivants :\r\n----\r\n<<biblio.title>>\r\n----\r\nMerci.\r\n\r\n<<branches.branchname>>.','email'),
>-('circulation','HOLD_SLIP','','Ticket de rÃ©servation',1,'Ticket de rÃ©servation','<h5>Date : <<today>></h5>\r\n\r\n<h3> Transfert / RÃ©servation disponible Ã  <<branches.branchname>></h3>\r\n\r\n<h3><<borrowers.surname>>, <<borrowers.firstname>> </h3>\r\n\r\n<ul>\r\n    <li><<borrowers.cardnumber>></li>\r\n    <li><<borrowers.phone>></li>\r\n    <li> <<borrowers.address>><br />\r\n         <<borrowers.address2>><br />\r\n         <<borrowers.city >>  <<borrowers.zipcode>>\r\n    </li>\r\n    <li><<borrowers.email>></li>\r\n</ul>\r\n<br />\r\n<h3>DOCUMENT RÃSERVÃ</h3>\r\n<h4><<biblio.title>></h4>\r\n<h5><<biblio.author>></h5>\r\n<ul>\r\n   <li><<items.barcode>></li>\r\n   <li><<items.itemcallnumber>></li>\r\n   <li><<reserves.waitingdate>></li>\r\n</ul>\r\n<p>Notes :\r\n<pre><<reserves.reservenotes>></pre>\r\n</p>\r\n','email'),
>-('circulation','TRANSFERSLIP','','Ticket de transfert',1,'Ticket de transfert','<h5>Date : <<today>></h5>\r\n\r\n<h3>Transfert Ã  <<branches.branchname>></h3>\r\n\r\n<h3>DOCUMENT</h3>\r\n<h4><<biblio.title>></h4>\r\n<h5><<biblio.author>></h5>\r\n<ul>\r\n   <li><<items.barcode>></li>\r\n   <li><<items.itemcallnumber>></li>\r\n</ul>','email'),
>+('circulation','HOLD_SLIP','','Ticket de rÃ©servation',1,'Ticket de rÃ©servation','<h5>Date:<<today>></h5>\r\n\r\n<h3> Transfert / RÃ©servation disponible Ã  <<branches.branchname>></h3>\r\n\r\n<h3><<borrowers.surname>>, <<borrowers.firstname>> </h3>\r\n\r\n<ul>\r\n    <li><<borrowers.cardnumber>></li>\r\n    <li><<borrowers.phone>></li>\r\n    <li> <<borrowers.address>><br />\r\n         <<borrowers.address2>><br />\r\n         <<borrowers.city >>  <<borrowers.zipcode>>\r\n    </li>\r\n    <li><<borrowers.email>></li>\r\n</ul>\r\n<br />\r\n<h3>DOCUMENT RÃSERVÃ</h3>\r\n<h4><<biblio.title>></h4>\r\n<h5><<biblio.author>></h5>\r\n<ul>\r\n   <li><<items.barcode>></li>\r\n   <li><<items.itemcallnumber>></li>\r\n   <li><<reserves.waitingdate>></li>\r\n</ul>\r\n<p>Notes :\r\n<pre><<reserves.reservenotes>></pre>\r\n</p>\r\n','email'),
>+('circulation','TRANSFERSLIP','','Ticket de transfert',1,'Ticket de transfert','<h5>Date:<<today>></h5>\r\n\r\n<h3>Transfert Ã  <<branches.branchname>></h3>\r\n\r\n<h3>DOCUMENT</h3>\r\n<h4><<biblio.title>></h4>\r\n<h5><<biblio.author>></h5>\r\n<ul>\r\n   <li><<items.barcode>></li>\r\n   <li><<items.itemcallnumber>></li>\r\n</ul>','email'),
> ('claimacquisition','ACQCLAIM','','RÃ©clamation d\'une commande',0,'Document non reÃ§u','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\nBonjour,\r\n\r\nLa commande suivante n\'a pas Ã©tÃ© reÃ§ue par notre service d\'acquisitions.\r\n\r\n<order>Commande n. <<aqorders.ordernumber>> (<<biblio.title>>) (<<aqorders.quantity>> exemplaire(s) commandÃ©(s)) ($<<aqorders.listprice>> / unitÃ©).</order>\r\n\r\nMerci de faire le nÃ©cessaire pour nous la faire parvenir rapidement.\r\n\r\nEn cas de problÃ¨me, veuillez nous contacter Ã  l\'adresse ci-dessous.\r\n\r\nCordialement,\r\n\r\n<<branches.branchname>>\r\n<<branches.branchaddress1>>\r\n<<branches.branchaddress2>>\r\n<<branches.branchaddress3>>\r\n<<branches.branchcity>> <<branches.branchzip>>\r\n<<branches.branchphone>>\r\n<<branches.branchemail>>\r\n','email'),
> ('orderacquisition','ACQORDER','','Commande',0,'Commande','<<aqbooksellers.name>>\r\n<<aqbooksellers.address1>>\r\n<<aqbooksellers.address2>>\r\n<<aqbooksellers.address3>>\r\n<<aqbooksellers.address4>>\r\n<<aqbooksellers.phone>>\r\n\r\nLa bibliothÃ¨que dÃ©sire commander :\r\n\r\n<order>Ordernumber <<aqorders.ordernumber>> (<<biblio.title>>) (quantity: <<aqorders.quantity>>) ($<<aqorders.listprice>> chacun).</order>\r\n\r\nMerci,\n\n<<branches.branchname>>', 'email'),
>-('members','ACCTDETAILS','','ModÃ¨le de message pour les dÃ©tails d\'un compte lecteur - DEFAULT',0,'Votre compte Koha','Bonjour <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nLes informations pour vous connecter Ã  votre compte lecteur sont :\r\n\r\nIdentifiant :  <<borrowers.userid>>\r\nMot de passe: <<borrowers.password>>\r\n\r\nSi vous rencontrez des problÃ¨mes ou avez des questions concernant votre compte, veuillez contacter l\'administrateur de Koha.\r\n\r\nMerci, \r\nL\'administrateur de Koha\r\nkohaadmin@yoursite.org','email'),
>-('reserves','HOLD','','RÃ©servation en attente de retrait',0,'RÃ©servation en attente de retrait Ã  <<branches.branchname>>','Bonjour <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nVotre rÃ©servation est disponible depuis le <<reserves.waitingdate>> :\r\n\r\nTitre : <<biblio.title>>\r\nAuteur : <<biblio.author>>\r\nCopie : <<items.copynumber>>\r\nLocalisation : <<branches.branchname>>\r\n<<branches.branchaddress1>>\r\n<<branches.branchaddress2>>\r\n<<branches.branchaddress3>>\r\n<<branches.branchcity>> <<branches.branchzip>>\r\n\r\nNous vous invitons Ã  venir emprunter votre document rapidement.\r\n\r\nMerci.\r\n\r\n<<branches.branchname>>','email'),
>-('reserves','HOLD','','RÃ©servation en attente de retrait',0,'RÃ©servation en attente de retrait Ã  <<branches.branchname>>','Bonjour <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nVotre rÃ©servation est disponible depuis le <<reserves.waitingdate>> :\r\n\r\nTitre : <<biblio.title>>\r\nAuteur : <<biblio.author>>\r\nCopie : <<items.copynumber>>\r\nLocalisation : <<branches.branchname>>\r\n<<branches.branchaddress1>>\r\n<<branches.branchaddress2>>\r\n<<branches.branchaddress3>>\r\n<<branches.branchcity>> <<branches.branchzip>>\r\n\r\nNous vous invitons Ã  venir emprunter votre document rapidement.\r\n\r\nMerci.\r\n\r\n<<branches.branchname>>','print'),
>-('reserves','HOLDPLACED','','RÃ©servation sur un document',0,'Un document a Ã©tÃ© rÃ©servÃ©','Le document suivant a Ã©tÃ© rÃ©servÃ© : \r\n<<biblio.title>> (<<biblio.biblionumber>>) par l\'adhÃ©rent <<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>).','email'),
>-('reserves', 'CANCEL_HOLD_ON_LOST', '','RÃ©servation annulÃ©e',0,"RÃ©servation annulÃ©e", "Bonjour [% borrower.firstname %] [% borrower.surname %],\n\nVotre rÃ©servation pour le document suivant ne peut malheureusement pas Ãªtre comblÃ©e parce que le document est introuvable.\n\nTitre : [% biblio.title %]\nAuteur : [% biblio.author %]\nExemplaire : [% item.copynumber %]\nLocalisation : [% branch.branchname %]", 'email'),
>+('members','ACCTDETAILS','','ModÃ¨le de message pour les dÃ©tails d\'un compte lecteur - DEFAULT',0,'Votre compte Koha','Bonjour <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nLes informations pour vous connecter Ã  votre compte lecteur sont :\r\n\r\nIdentifiant: <<borrowers.userid>>\r\nMot de passe: <<borrowers.password>>\r\n\r\nSi vous rencontrez des problÃ¨mes ou avez des questions concernant votre compte, veuillez contacter l\'administrateur de Koha.\r\n\r\nMerci, \r\nL\'administrateur de Koha\r\nkohaadmin@yoursite.org','email'),
>+('reserves','HOLD','','RÃ©servation en attente de retrait',0,'RÃ©servation en attente de retrait Ã  <<branches.branchname>>','Bonjour <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nVotre rÃ©servation est disponible depuis le <<reserves.waitingdate>> :\r\n\r\nTitre:<<biblio.title>>\r\nAuteur:<<biblio.author>>\r\nCopie:<<items.copynumber>>\r\nLocalisation:<<branches.branchname>>\r\n<<branches.branchaddress1>>\r\n<<branches.branchaddress2>>\r\n<<branches.branchaddress3>>\r\n<<branches.branchcity>> <<branches.branchzip>>\r\n\r\nNous vous invitons Ã  venir emprunter votre document rapidement.\r\n\r\nMerci.\r\n\r\n<<branches.branchname>>','email'),
>+('reserves','HOLD','','RÃ©servation en attente de retrait',0,'RÃ©servation en attente de retrait Ã  <<branches.branchname>>','Bonjour <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nVotre rÃ©servation est disponible depuis le <<reserves.waitingdate>> :\r\n\r\nTitre:<<biblio.title>>\r\nAuteur:<<biblio.author>>\r\nCopie:<<items.copynumber>>\r\nLocalisation:<<branches.branchname>>\r\n<<branches.branchaddress1>>\r\n<<branches.branchaddress2>>\r\n<<branches.branchaddress3>>\r\n<<branches.branchcity>> <<branches.branchzip>>\r\n\r\nNous vous invitons Ã  venir emprunter votre document rapidement.\r\n\r\nMerci.\r\n\r\n<<branches.branchname>>','print'),
>+('reserves','HOLDPLACED','','RÃ©servation sur un document',0,'Un document a Ã©tÃ© rÃ©servÃ©','Le document suivant a Ã©tÃ© rÃ©servÃ©:\r\n<<biblio.title>> (<<biblio.biblionumber>>) par l\'adhÃ©rent <<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>).','email'),
>+('reserves', 'CANCEL_HOLD_ON_LOST', '','RÃ©servation annulÃ©e',0,"RÃ©servation annulÃ©e", "Bonjour [% borrower.firstname %] [% borrower.surname %],\n\nVotre rÃ©servation pour le document suivant ne peut malheureusement pas Ãªtre comblÃ©e parce que le document est introuvable.\n\nTitre:[% biblio.title %]\nAuteur:[% biblio.author %]\nExemplaire:[% item.copynumber %]\nLocalisation:[% branch.branchname %]", 'email'),
> ('serial','SERIAL_ALERT','','Liste de circulation',0,'Le nouveau numÃ©ro de <<biblio.title>> est disponible','Bonjour <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nLe nouveau numÃ©ro de <<biblio.title>> est disponible.\r\n\r\nVous pouvez venir Ã  la bilbliothÃ¨que pour le consulter.\r\n\r\nMerci.\r\n\r\n<<branches.branchname>>','email'),
>-('suggestions','ACCEPTED','','Suggestion d\'achat acceptÃ©e',0,'Suggestion d\'achat acceptÃ©e','Bonjour <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nVous nous avez suggÃ©rÃ© l\'achat du document <<suggestions.title>> par <<suggestions.author>>.\r\n\r\nNous avons Ã©valuÃ© votre suggestion aujourdhui. Le document sera commandÃ© dÃ¨s que possible. Vous serez tenu au courant par courriel quand le document aura Ã©tÃ© commandÃ© et quand il sera disponible Ã  la bibliothÃ¨que.\r\n\r\nPour toute question, veuillez nous contacter Ã  l\'adresse suivante : <<branches.branchemail>>.\r\n\r\nMerci.\r\n\r\n<<branches.branchname>>','email'),
>-('suggestions','AVAILABLE','','Suggestion d\'achat disponible',0,'Suggestion d\'achat disponible','Bonjour <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nVous nous avez suggÃ©rÃ© l\'achat du document <<suggestions.title>> par <<suggestions.author>>.\r\n\r\nNous avons le plaisir de vous informer que le document fait aujourd\'hui partie de nos collection et qu\'il est disponible Ã  la bibliothÃ¨que.\r\n\r\nPour toute question, veuillez nous contacter Ã  l\'adresse suivante : <<branches.branchemail>>.\r\n\r\nMerci.\r\n\r\n<<branches.branchname>>','email'),
>-('suggestions','ORDERED','','Suggestion d\'achat commandÃ©e',0,'Suggestion d\'achat commandÃ©e','Bonjour <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nVous nous avez suggÃ©rÃ© l\'achat du document <<suggestions.title>> par <<suggestions.author>>.\r\n\r\nNous avons le plaisir de vous informer que le document a Ã©tÃ© commandÃ©.\r\n\r\nVous recevrez une nouvelle notification quand le document sera disponible Ã  bibliothÃ¨que.\r\n\r\nPour toute question, veuillez nous contacter Ã  l\'adresse suivante : <<branches.branchemail>>.\r\n\r\nMerci.\r\n\r\n<<branches.branchname>>','email'),
>-('suggestions','REJECTED','','Suggestion d\'achat rejetÃ©e',0,'Suggestion d\'achat rejetÃ©e','Bonjour <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nVous nous avez suggÃ©rÃ© l\'achat du document <<suggestions.title>> par <<suggestions.author>>.\r\n\r\nNous avons Ã©valuÃ© votre suggestion aujourd\'hui et dÃ©cidÃ© de ne pas l\'acheter cette fois.\r\n\r\nLa raison de notre refus est : <<suggestions.reason>>\r\n\r\nPour toute question, veuillez nous contacter Ã  l\'adresse suivante : <<branches.branchemail>>.\r\n\r\nMerci.\r\n\r\n<<branches.branchname>>','email');
>+('suggestions','ACCEPTED','','Suggestion d\'achat acceptÃ©e',0,'Suggestion d\'achat acceptÃ©e','Bonjour <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nVous nous avez suggÃ©rÃ© l\'achat du document <<suggestions.title>> par <<suggestions.author>>.\r\n\r\nNous avons Ã©valuÃ© votre suggestion aujourdhui. Le document sera commandÃ© dÃ¨s que possible. Vous serez tenu au courant par courriel quand le document aura Ã©tÃ© commandÃ© et quand il sera disponible Ã  la bibliothÃ¨que.\r\n\r\nPour toute question, veuillez nous contacter Ã  l\'adresse suivante:<<branches.branchemail>>.\r\n\r\nMerci.\r\n\r\n<<branches.branchname>>','email'),
>+('suggestions','AVAILABLE','','Suggestion d\'achat disponible',0,'Suggestion d\'achat disponible','Bonjour <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nVous nous avez suggÃ©rÃ© l\'achat du document <<suggestions.title>> par <<suggestions.author>>.\r\n\r\nNous avons le plaisir de vous informer que le document fait aujourd\'hui partie de nos collection et qu\'il est disponible Ã  la bibliothÃ¨que.\r\n\r\nPour toute question, veuillez nous contacter Ã  l\'adresse suivante:<<branches.branchemail>>.\r\n\r\nMerci.\r\n\r\n<<branches.branchname>>','email'),
>+('suggestions','ORDERED','','Suggestion d\'achat commandÃ©e',0,'Suggestion d\'achat commandÃ©e','Bonjour <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nVous nous avez suggÃ©rÃ© l\'achat du document <<suggestions.title>> par <<suggestions.author>>.\r\n\r\nNous avons le plaisir de vous informer que le document a Ã©tÃ© commandÃ©.\r\n\r\nVous recevrez une nouvelle notification quand le document sera disponible Ã  bibliothÃ¨que.\r\n\r\nPour toute question, veuillez nous contacter Ã  l\'adresse suivante:<<branches.branchemail>>.\r\n\r\nMerci.\r\n\r\n<<branches.branchname>>','email'),
>+('suggestions','REJECTED','','Suggestion d\'achat rejetÃ©e',0,'Suggestion d\'achat rejetÃ©e','Bonjour <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nVous nous avez suggÃ©rÃ© l\'achat du document <<suggestions.title>> par <<suggestions.author>>.\r\n\r\nNous avons Ã©valuÃ© votre suggestion aujourd\'hui et dÃ©cidÃ© de ne pas l\'acheter cette fois.\r\n\r\nLa raison de notre refus est:<<suggestions.reason>>\r\n\r\nPour toute question, veuillez nous contacter Ã  l\'adresse suivante:<<branches.branchemail>>.\r\n\r\nMerci.\r\n\r\n<<branches.branchname>>','email');
> 
> INSERT INTO `letter` (module, code, name, title, content, is_html, message_transport_type)
>-VALUES ('suggestions','NEW_SUGGESTION','New suggestion','New Suggestion','<h3> Suggestion pending approval</h3>
>+VALUES ('suggestions','NEW_SUGGESTION','New suggestion','New suggestion','<h3>Suggestion pending approval</h3>
> <p><h4>Suggested by</h4>
>  <ul>
>    <li><<borrowers.firstname>> <<borrowers.surname>></li>
>@@ -34,28 +34,28 @@ VALUES ('suggestions','NEW_SUGGESTION','New suggestion','New Suggestion','<h3> S
>    <li><<borrowers.email>></li>
>  </ul>
> </p>
>-<p><h4>Item on suggestion</h4>
>+<p><h4>Title suggested</h4>
>  <ul>
>-   <li><b>Library : </b> <<branches.branchname>></li>
>-   <li><b>Title : </b> <<suggestions.title>></li>
>-   <li><b>Author : </b> <<suggestions.author>></li>
>-   <li><b>Copyright date : </b> <<suggestions.copyrightdate>></li>
>-   <li><b>Standard number (ISBN, ISSN or other) : </b> <<suggestions.isbn>></li>
>-   <li><b>Publisher : </b> <<suggestions.publishercode>></li>
>-   <li><b>Collection title : </b> <<suggestions.collectiontitle>></li>
>-   <li><b>Publication place : </b> <<suggestions.place>></li>
>-   <li><b>Quantity : </b> <<suggestions.quantity>></li>
>-   <li><b>Item type : </b>  <<suggestions.itemtype>></li>
>-   <li><b>Reason for suggestion : </b> <<suggestions.patronreason>></li>
>-   <li><b>Notes : </b> <<suggestions.note>></li>
>+   <li><b>Library:</b> <<branches.branchname>></li>
>+   <li><b>Title:</b> <<suggestions.title>></li>
>+   <li><b>Author:</b> <<suggestions.author>></li>
>+   <li><b>Copyright date:</b> <<suggestions.copyrightdate>></li>
>+   <li><b>Standard number (ISBN, ISSN or other):</b> <<suggestions.isbn>></li>
>+   <li><b>Publisher:</b> <<suggestions.publishercode>></li>
>+   <li><b>Collection title:</b> <<suggestions.collectiontitle>></li>
>+   <li><b>Publication place:</b> <<suggestions.place>></li>
>+   <li><b>Quantity:</b> <<suggestions.quantity>></li>
>+   <li><b>Item type:</b> <<suggestions.itemtype>></li>
>+   <li><b>Reason for suggestion:</b> <<suggestions.patronreason>></li>
>+   <li><b>Notes:</b> <<suggestions.note>></li>
>  </ul>
> </p>',1, 'email');
> 
> INSERT INTO `letter` (module, code, branchcode, name, is_html, title, content, message_transport_type) VALUES
>-('members','DISCHARGE','','Quittance',0,'Quittance pour <<borrowers.firstname>> <<borrowers.surname>>','Quittance\r\n\r\nLa bibliothÃ¨que <<borrowers.branchcode>> certifie que l\'utilisateur suivant :\r\n\r\n<<borrowers.firstname>> <<borrowers.surname>>\r\nCardnumber : <<borrowers.cardnumber>>\r\n\r\na rendu tous ses documents.','email');
>+('members','DISCHARGE','','Quittance',0,'Quittance pour <<borrowers.firstname>> <<borrowers.surname>>','Quittance\r\n\r\nLa bibliothÃ¨que <<borrowers.branchcode>> certifie que l\'utilisateur suivant :\r\n\r\n<<borrowers.firstname>> <<borrowers.surname>>\r\nCardnumber:<<borrowers.cardnumber>>\r\n\r\na rendu tous ses documents.','email');
> 
> INSERT INTO `letter` (module, code, branchcode, name, is_html, title, content, message_transport_type) VALUES
>-('members','OPAC_REG_VERIFY','','Courriel de vÃ©rification lors d\'une auto-inscription',1,'VÃ©rification de votre compte','Bonjour <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nVotre compte lecteur a Ã©tÃ© crÃ©Ã©. Pour terminer votre inscription, veuillez confirmer votre courriel en cliquant sur ce lien : \r\n\r\nhttp://<<OPACBaseURL>>/cgi-bin/koha/opac-registration-verify.pl?token=<<borrower_modifications.verification_token>>\r\n\r\nSi vous n\'Ãªtes pas Ã  l\'origine de cette inscription, vous pouvez ignorer ce message. Le lien expirera sous peu.\r\n\r\nMerci.\r\n\r\n<<branches.branchname>>','email');
>+('members','OPAC_REG_VERIFY','','Courriel de vÃ©rification lors d\'une auto-inscription',1,'VÃ©rification de votre compte','Bonjour <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nVotre compte lecteur a Ã©tÃ© crÃ©Ã©. Pour terminer votre inscription, veuillez confirmer votre courriel en cliquant sur ce lien:\r\n\r\nhttp://<<OPACBaseURL>>/cgi-bin/koha/opac-registration-verify.pl?token=<<borrower_modifications.verification_token>>\r\n\r\nSi vous n\'Ãªtes pas Ã  l\'origine de cette inscription, vous pouvez ignorer ce message. Le lien expirera sous peu.\r\n\r\nMerci.\r\n\r\n<<branches.branchname>>','email');
> 
> INSERT INTO `letter` (module, code, branchcode, name, is_html, title, content, message_transport_type) VALUES
> ('members','SHARE_INVITE','','Invitation pour partager une liste',0,'Partage de la liste <<listname>>','Bonjour <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nUn de nos lecteurs, <<borrowers.firstname>> <<borrowers.surname>>, vous invite Ã  partager la liste <<listname>> dans le catalogue de la bibliothÃ¨que.\r\n\r\nPour voir cette liste, veuillez cliquer sur le lien suivant ou le copier/coller dans la barre d\'adresse de votre navigateur.\r\n\r\n<<shareurl>>\r\n\r\nSi vous n\'Ãªtes pas un adhÃ©rent de notre bibliothÃ¨que ou si vous ne souhaitez pas accepter cette invitation, merci d\'ignorer ce message. Veuillez noter Ã©galement que cette invitation expirera dans deux semaines.\r\n\r\nMerci.\r\n\r\n<<branches.branchname>>','email');
>@@ -67,20 +67,20 @@ INSERT INTO `letter` (module, code, branchcode, name, is_html, title, content, m
> ('acquisition','ACQ_NOTIF_ON_RECEIV','','Notification lors de la rÃ©ception',0,'Commande reÃ§ue','Bonjour <<borrowers.firstname>> <<borrowers.surname>bbbb>,\r\n\r\nLa commande <<aqorders.ordernumber>> (<<biblio.title>>) a Ã©tÃ© reÃ§ue.\r\n\r\n<<branches.branchname>>','email');
> 
> INSERT INTO `letter` (module, code, name, title, content, message_transport_type) VALUES
>-('suggestions','TO_PROCESS','Notification pour le responsable du poste budgÃ©taire', 'Une suggestion est prÃªte Ã  Ãªtre traitÃ©e','Bonjour <<borrowers.firstname>> <<borrowers.surname>>,\n\nUne nouvelle suggestion est prÃªte Ã  Ãªtre traitÃ©e : <<suggestions.title>> par <<suggestions.author>>.\n\nMerci,\n\n<<branches.branchname>>', 'email');
>+('suggestions','TO_PROCESS','Notification pour le responsable du poste budgÃ©taire', 'Une suggestion est prÃªte Ã  Ãªtre traitÃ©e','Bonjour <<borrowers.firstname>> <<borrowers.surname>>,\n\nUne nouvelle suggestion est prÃªte Ã  Ãªtre traitÃ©e:<<suggestions.title>> par <<suggestions.author>>.\n\nMerci,\n\n<<branches.branchname>>', 'email');
> 
> INSERT INTO letter ( module, code, branchcode, name, is_html, title, content, message_transport_type ) VALUES
> ('circulation', 'OVERDUES_SLIP', '', 'Ticket pour les documents en retard', '0', 'OVERDUES_SLIP', 'Le(s) document(s) est/sont prÃ©sentement en retard :
> 
>-<item>"<<biblio.title>>" par <<biblio.author>>, <<items.itemcallnumber>>, Code-barres : <<items.barcode>> Amendes : <<items.fine>></item>
>+<item>"<<biblio.title>>" par <<biblio.author>>, <<items.itemcallnumber>>, Code-barres:<<items.barcode>> Amendes:<<items.fine>></item>
> ', 'print' );
> 
> INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`, `content`, `message_transport_type`) VALUES
>-('circulation', 'AR_CANCELED', '', 'Demande d\'article - annulation', 0, 'Demande d\'article annulÃ©e', 'Bonjour <<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>),\r\n\r\nVotre demande d\'article de <<biblio.title>> (<<items.barcode>>) a Ã©tÃ© annulÃ©e pour la raison suivante :\r\n\r\n<<article_requests.notes>>\r\n\r\nArticle demandÃ© :\r\nTitre : <<article_requests.title>>\r\nAuteur : <<article_requests.author>>\r\nVolume : <<article_requests.volume>>\r\nNumÃ©ro : <<article_requests.issue>>\r\nDate : <<article_requests.date>>\r\nPages : <<article_requests.pages>>\r\nChapitres : <<article_requests.chapters>>\r\nNotes : <<article_requests.patron_notes>>\r\n\r\nVotre bibliothÃ¨que.', 'email'),
>-('circulation', 'AR_COMPLETED', '', 'Demande d\'article - disponible', 0, 'L\'article demandÃ© est disponible', 'Bonjour <<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>),\r\n\r\nL\'article de <<biblio.title>> (<<items.barcode>>) que vous avez demandÃ© est maintenant disponible.\r\n\r\nArticle demandÃ© :\r\nTitre : <<article_requests.title>>\r\nAuteur : <<article_requests.author>>\r\nVolume : <<article_requests.volume>>\r\nNumÃ©ro : <<article_requests.issue>>\r\nDate : <<article_requests.date>>\r\nPages : <<article_requests.pages>>\r\nChapitres : <<article_requests.chapters>>\r\nNotes : <<article_requests.patron_notes>>\r\n\r\nVous pouvez venir chercher votre article Ã  <<branches.branchname>>.\r\n\r\nMerci.', 'email'),
>-('circulation', 'AR_PENDING', '', 'Demande d\'article - en attente', 0, 'Demande d\'article reÃ§ue', 'Bonjour <<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>)\r\n\r\nNous avons bien reÃ§u votre demande d\'article de <<biblio.title>> (<<items.barcode>>).\r\n\r\nArticle demandÃ© :\r\nTitre : <<article_requests.title>>\r\nAuteur : <<article_requests.author>>\r\nVolume : <<article_requests.volume>>\r\nNumÃ©ro : <<article_requests.issue>>\r\nDate : <<article_requests.date>>\r\nPages : <<article_requests.pages>>\r\nChapitres : <<article_requests.chapters>>\r\nNotes : <<article_requests.patron_notes>>\r\n\r\n\r\nMerci.', 'email'),
>-('circulation', 'AR_SLIP', '', 'Demande d\'article - ticket', 0, 'Demande d\'article', 'Demande d\'article :\r\n\r\n<<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>),\r\n\r\nTitre : <<biblio.title>>\r\nCode-barres : <<items.barcode>>\r\n\r\nArticle demandÃ© :\r\nTitre : <<article_requests.title>>\r\nAuteur : <<article_requests.author>>\r\nVolume : <<article_requests.volume>>\r\nNumÃ©ro : <<article_requests.issue>>\r\nDate : <<article_requests.date>>\r\nPages : <<article_requests.pages>>\r\nChapitres : <<article_requests.chapters>>\r\nNotes : <<article_requests.patron_notes>>\r\n', 'print'),
>-('circulation', 'AR_PROCESSING', '', 'Demande d\'article - en traitement', 0, 'Demande d\'article en traitement', 'Bonjour <<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>),\r\n\r\nNous traitons votre demande d\'article de <<biblio.title>> (<<items.barcode>>).\r\n\r\nArticle demandÃ© :\r\nTitre : <<article_requests.title>>\r\nAuteur : <<article_requests.author>>\r\nVolume : <<article_requests.volume>>\r\nNumÃ©ro : <<article_requests.issue>>\r\nDate : <<article_requests.date>>\r\nPages : <<article_requests.pages>>\r\nChapitres : <<article_requests.chapters>>\r\nNotes : <<article_requests.patron_notes>>\r\n\r\nMerci.', 'email'),
>+('circulation', 'AR_CANCELED', '', 'Demande d\'article - annulation', 0, 'Demande d\'article annulÃ©e', 'Bonjour <<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>),\r\n\r\nVotre demande d\'article de <<biblio.title>> (<<items.barcode>>) a Ã©tÃ© annulÃ©e pour la raison suivante :\r\n\r\n<<article_requests.notes>>\r\n\r\nArticle demandÃ© :\r\nTitre:<<article_requests.title>>\r\nAuteur:<<article_requests.author>>\r\nVolume:<<article_requests.volume>>\r\nNumÃ©ro:<<article_requests.issue>>\r\nDate:<<article_requests.date>>\r\nPages:<<article_requests.pages>>\r\nChapitres:<<article_requests.chapters>>\r\nNotes:<<article_requests.patron_notes>>\r\n\r\nVotre bibliothÃ¨que.', 'email'),
>+('circulation', 'AR_COMPLETED', '', 'Demande d\'article - disponible', 0, 'L\'article demandÃ© est disponible', 'Bonjour <<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>),\r\n\r\nL\'article de <<biblio.title>> (<<items.barcode>>) que vous avez demandÃ© est maintenant disponible.\r\n\r\nArticle demandÃ© :\r\nTitre:<<article_requests.title>>\r\nAuteur:<<article_requests.author>>\r\nVolume:<<article_requests.volume>>\r\nNumÃ©ro:<<article_requests.issue>>\r\nDate:<<article_requests.date>>\r\nPages:<<article_requests.pages>>\r\nChapitres:<<article_requests.chapters>>\r\nNotes:<<article_requests.patron_notes>>\r\n\r\nVous pouvez venir chercher votre article Ã  <<branches.branchname>>.\r\n\r\nMerci.', 'email'),
>+('circulation', 'AR_PENDING', '', 'Demande d\'article - en attente', 0, 'Demande d\'article reÃ§ue', 'Bonjour <<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>)\r\n\r\nNous avons bien reÃ§u votre demande d\'article de <<biblio.title>> (<<items.barcode>>).\r\n\r\nArticle demandÃ© :\r\nTitre:<<article_requests.title>>\r\nAuteur:<<article_requests.author>>\r\nVolume:<<article_requests.volume>>\r\nNumÃ©ro:<<article_requests.issue>>\r\nDate:<<article_requests.date>>\r\nPages:<<article_requests.pages>>\r\nChapitres:<<article_requests.chapters>>\r\nNotes:<<article_requests.patron_notes>>\r\n\r\n\r\nMerci.', 'email'),
>+('circulation', 'AR_SLIP', '', 'Demande d\'article - ticket', 0, 'Demande d\'article', 'Demande d\'article :\r\n\r\n<<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>),\r\n\r\nTitre:<<biblio.title>>\r\nCode-barres:<<items.barcode>>\r\n\r\nArticle demandÃ© :\r\nTitre:<<article_requests.title>>\r\nAuteur:<<article_requests.author>>\r\nVolume:<<article_requests.volume>>\r\nNumÃ©ro:<<article_requests.issue>>\r\nDate:<<article_requests.date>>\r\nPages:<<article_requests.pages>>\r\nChapitres:<<article_requests.chapters>>\r\nNotes:<<article_requests.patron_notes>>\r\n', 'print'),
>+('circulation', 'AR_PROCESSING', '', 'Demande d\'article - en traitement', 0, 'Demande d\'article en traitement', 'Bonjour <<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>),\r\n\r\nNous traitons votre demande d\'article de <<biblio.title>> (<<items.barcode>>).\r\n\r\nArticle demandÃ© :\r\nTitre:<<article_requests.title>>\r\nAuteur:<<article_requests.author>>\r\nVolume:<<article_requests.volume>>\r\nNumÃ©ro:<<article_requests.issue>>\r\nDate:<<article_requests.date>>\r\nPages:<<article_requests.pages>>\r\nChapitres:<<article_requests.chapters>>\r\nNotes:<<article_requests.patron_notes>>\r\n\r\nMerci.', 'email'),
> ('circulation', 'CHECKOUT_NOTE', '', 'Notes d\'un utilisateur sur les documents en prÃªt', '0', 'Notes sur les documents en prÃªts', '<<borrowers.firstname>> <<borrowers.surname>> a ajoutÃ© une note sur un exemplaire de <<biblio.title>> - <<biblio.author>> (<<biblio.biblionumber>>).','email');
> 
> INSERT INTO `letter` (module, code, branchcode, name, is_html, title, content, message_transport_type)
>@@ -89,8 +89,8 @@ VALUES ('members','PASSWORD_RESET','','RÃ©cupÃ©ration de mot de passe en ligne',
> 
> INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`, `content`, `message_transport_type`, `lang`)
>     VALUES
>-        ('circulation', 'ACCOUNT_PAYMENT', '', 'Paiement', 0, 'Paiement', '[%- USE Price -%]\r\nVous avez fait un paiement de [% credit.amount * -1 | $Price %].\r\n\r\nLes frais suivants ont Ã©tÃ© acquittÃ©s :\r\n[%- FOREACH o IN offsets %]\r\nDescription : [% o.debit.description %]\r\nMontant payÃ© : [% o.amount * -1 | $Price %]\r\nMontant en souffrance : [% o.debit.amountoutstanding | $Price %]\r\n[% END %]', 'email', 'default'),
>-            ('circulation', 'ACCOUNT_WRITEOFF', '', 'Amnistie', 0, 'Amnistie', '[%- USE Price -%]\r\nNous avons accordÃ© une amnistie de [% credit.amount * -1 | $Price %] Ã  votre compte.\r\n\r\nLes frais suivants ont Ã©tÃ© amnistiÃ©s :\r\n[%- FOREACH o IN offsets %]\r\nDescription: [% o.debit.description %]\r\nMontant payÃ© : [% o.amount * -1 | $Price %]\r\nMontant en souffrance : [% o.debit.amountoutstanding | $Price %]\r\n[% END %]', 'email', 'default');
>+        ('circulation', 'ACCOUNT_PAYMENT', '', 'Paiement', 0, 'Paiement', '[%- USE Price -%]\r\nVous avez fait un paiement de [% credit.amount * -1 | $Price %].\r\n\r\nLes frais suivants ont Ã©tÃ© acquittÃ©s :\r\n[%- FOREACH o IN offsets %]\r\nDescription:[% o.debit.description %]\r\nMontant payÃ©:[% o.amount * -1 | $Price %]\r\nMontant en souffrance:[% o.debit.amountoutstanding | $Price %]\r\n[% END %]', 'email', 'default'),
>+            ('circulation', 'ACCOUNT_WRITEOFF', '', 'Amnistie', 0, 'Amnistie', '[%- USE Price -%]\r\nNous avons accordÃ© une amnistie de [% credit.amount * -1 | $Price %] Ã  votre compte.\r\n\r\nLes frais suivants ont Ã©tÃ© amnistiÃ©s :\r\n[%- FOREACH o IN offsets %]\r\nDescription: [% o.debit.description %]\r\nMontant payÃ©:[% o.amount * -1 | $Price %]\r\nMontant en souffrance:[% o.debit.amountoutstanding | $Price %]\r\n[% END %]', 'email', 'default');
> 
> INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`, `content`, `message_transport_type`) VALUES
>-('circulation', 'SR_SLIP', '', 'Ticket de rotation automatique d\'exemplaires', 0, 'Rapport de rotation automatique d\'exemplaires', 'Rapport de rotation automatique d\'exemplaires pour [% branch.name %]:\r\n\r\n[% IF branch.items.size %][% branch.items.size %] exemplaires de cette bibliothÃ¨que Ã  traiter.\r\n[% ELSE %]Aucun exemplaire de cette bibliothÃ¨que Ã  traiter\r\n[% END %][% FOREACH item IN branch.items %][% IF item.reason != \'in-demand\' %]Titre : [% item.title %]\r\nAuteur : [% item.author %]\r\nCote : [% item.callnumber %]\r\nLocalisation : [% item.location %]\r\nCode-barres: [% item.barcode %]\r\nEn prÃªt? : [% item.onloan %]\r\nStatut : [% item.reason %]\r\nBibliothÃ¨que dÃ©positaire : [% item.branch.branchname %] [% item.branch.branchcode %]\r\n\r\n[% END %][% END %]', 'email');
>+('circulation', 'SR_SLIP', '', 'Ticket de rotation automatique d\'exemplaires', 0, 'Rapport de rotation automatique d\'exemplaires', 'Rapport de rotation automatique d\'exemplaires pour [% branch.name %]:\r\n\r\n[% IF branch.items.size %][% branch.items.size %] exemplaires de cette bibliothÃ¨que Ã  traiter.\r\n[% ELSE %]Aucun exemplaire de cette bibliothÃ¨que Ã  traiter\r\n[% END %][% FOREACH item IN branch.items %][% IF item.reason != \'in-demand\' %]Titre:[% item.title %]\r\nAuteur:[% item.author %]\r\nCote:[% item.callnumber %]\r\nLocalisation:[% item.location %]\r\nCode-barres: [% item.barcode %]\r\nEn prÃªt?:[% item.onloan %]\r\nStatut:[% item.reason %]\r\nBibliothÃ¨que dÃ©positaire:[% item.branch.branchname %] [% item.branch.branchcode %]\r\n\r\n[% END %][% END %]', 'email');
>diff --git a/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql b/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql
>index 3c087ce611..caee6cfeff 100644
>--- a/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql
>+++ b/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql
>@@ -14,17 +14,17 @@ VALUES
> ('reserves', 'HOLD', 'RÃ©servation disponible pour retrait', 'RÃ©servation disponible Ã  la banque de retrait du site <<branches.branchname>>', '<<branches.branchname>>\n<<branches.branchaddress1>>\n<<branches.branchaddress2>>\n\n\nLe service des rÃ©servations\n\n\n\n\n\n\n\n<<borrowers.firstname>> <<borrowers.surname>>\n<<borrowers.address>>\n<<borrowers.city>> <<borrowers.zipcode>>\n\n\n\n\n\n\n\n\n\n\n<<borrowers.firstname>> <<borrowers.surname>> <<borrowers.cardnumber>>\n\nVotre rÃ©servation est disponible pour retrait depuis le <<reserves.waitingdate>>:\r\n\r\nTitre: <<biblio.title>>\r\nAuteur: <<biblio.author>>\r\nNumÃ©ro de fascicule: <<items.copynumber>>\r\n', 'print'),
> ('circulation','CHECKIN','Document rendu (rÃ©sumÃ©)','Retours','Les documents suivants ont Ã©tÃ© rendus:\r\n----\r\n[% biblio.title %]\r\n----\r\nMerci.', 'email'),
> ('circulation','CHECKOUT','Document prÃªtÃ© (rÃ©sumÃ©)','PrÃªts','Les documents suivants ont Ã©tÃ© prÃªtÃ©s:\r\n----\r\n[% biblio.title %]\r\n----\r\nMerci de votre visite [% branch.branchname %].', 'email'),
>-('reserves', 'HOLDPLACED', 'Demande de rÃ©servation', 'Demande de rÃ©servation','Une demande de rÃ©servation a Ã©tÃ© placÃ©e sur le document : <<biblio.title>> (<<biblio.biblionumber>>) par l\'adhÃ©rent <<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>).', 'email'),
>+('reserves', 'HOLDPLACED', 'Demande de rÃ©servation', 'Demande de rÃ©servation','Une demande de rÃ©servation a Ã©tÃ© placÃ©e sur le document:<<biblio.title>> (<<biblio.biblionumber>>) par l\'adhÃ©rent <<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>).', 'email'),
> ('reserves', 'CANCEL_HOLD_ON_LOST', 'Hold has been cancelled', "Hold has been cancelled", "Dear [% borrower.firstname %] [% borrower.surname %],\n\nWe regret to inform you, that the following item can not be provided due to it being missing. Your hold was cancelled.\n\nTitle: [% biblio.title %]\nAuthor: [% biblio.author %]\nCopy: [% item.copynumber %]\nLocation: [% branch.branchname %]", 'email'),
> ('suggestions','ACCEPTED','Suggestion accceptÃ©e', 'Suggestion acceptÃ©e','Cher(e) <<borrowers.firstname>> <<borrowers.surname>>,\n\nVous avez crÃ©e une suggestion d\'achat au sujet du document <<suggestions.title>> de <<suggestions.author>>.\n\nLa BibliothÃ¨que a reÃ§u votre demande ce jour. Nous donnerons suite Ã  votre demande aussi vite que possible. Vous serez averti par courriel dÃ¨s que la commande sera envoyÃ©e,et quand les documents seront arrivÃ©s Ã  la BibliothÃ¨que.\n\nSi vous avez des questions, merci de nous contacter Ã  l\'adresse suivante <<branches.branchemail>>.\n\nMerci,\n\n<<branches.branchname>>', 'email'),
> ('suggestions','AVAILABLE','Suggestion disponible', 'Suggestion d\'achat disponible','cher(e) <<borrowers.firstname>> <<borrowers.surname>>,\n\nVous avez effectuÃ© une suggestion d\'achat pour le docuement  <<suggestions.title>> de <<suggestions.author>>.\n\nNous sommes heureux de vous informer que le document que vous aviez demandÃ© est maintenant disponible dans nos collections.\n\nSi vous avez des questions, merci de nous contacter par courriel Ã  l\'adresse <<branches.branchemail>>.\n\nMerci,\n\n<<branches.branchname>>', 'email'),
> ('suggestions','ORDERED','Suggestion commandÃ©e', 'Suggestion commandÃ©e','Cher(e) <<borrowers.firstname>> <<borrowers.surname>>,\n\nVous avez effectuÃ© une demande de suggestion d\'achat sur le docuement <<suggestions.title>> de <<suggestions.author>>.\n\nNous sommes heureux de vous informer que le document que vous avez demandÃ© est maintenant en commande. Le document devrait arriver rapidement dans nos collections.\n\nVous serez averti quand le docuement sera disponible.\n\nSi vous avez des questions, merci de nous contacter Ã  l\'adresse <<branches.branchemail>>\n\nMerci,\n\n<<branches.branchname>>', 'email'),
> ('suggestions','REJECTED','Suggestion rejetÃ©e', 'Suggestion d\'achat rejetÃ©','Cher(e) <<borrowers.firstname>> <<borrowers.surname>>,\n\nVous avez fait la demande du document <<suggestions.title>> de <<suggestions.author>>.\n\nla BibliothÃ¨que a examinÃ© votre demande ce jour, et a dÃ©cidÃ© de ne pas retenir la suggestion pour l\'instant.\n\nLa raison est la suivante: <<suggestions.reason>>\n\nSi vous avez des questions, merci de nous contacter Ã  l\'adresse <<branches.branchemail>>.\n\nMerci,\n\n<<branches.branchname>>', 'email'),
>-('suggestions','TO_PROCESS','Avis au propriÃ©taire du poste budgÃ©taire', 'Une suggestion est prÃªte Ã  Ãªtre traitÃ©e','<<borrowers.firstname>> <<borrowers.surname>>,\n\nUne nouvelle suggestion est prÃªte Ã  Ãªtre traitÃ©e : <<suggestions.title>> / <<suggestions.author>>.\n\nMerci,\n\n<<branches.branchname>>', 'email'),
>-('members', 'DISCHARGE', 'Quitus', 'Quitus pour <<borrowers.firstname>> <<borrowers.surname>>', '<h1>Quitus</h1>\r\n\r\nLa librairie <<borrowers.branchcode>> certifies que lecteur suivant :\r\n\r\n    <<borrowers.firstname>> <<borrowers.surname>>\r\n   NumÃ©ro de carte : <<borrowers.cardnumber>>\r\n\r\na bien retournÃ© tous ses documents.', 'email');
>+('suggestions','TO_PROCESS','Avis au propriÃ©taire du poste budgÃ©taire', 'Une suggestion est prÃªte Ã  Ãªtre traitÃ©e','<<borrowers.firstname>> <<borrowers.surname>>,\n\nUne nouvelle suggestion est prÃªte Ã  Ãªtre traitÃ©e:<<suggestions.title>> / <<suggestions.author>>.\n\nMerci,\n\n<<branches.branchname>>', 'email'),
>+('members', 'DISCHARGE', 'Quitus', 'Quitus pour <<borrowers.firstname>> <<borrowers.surname>>', '<h1>Quitus</h1>\r\n\r\nLa librairie <<borrowers.branchcode>> certifies que lecteur suivant :\r\n\r\n    <<borrowers.firstname>> <<borrowers.surname>>\r\n   NumÃ©ro de carte:<<borrowers.cardnumber>>\r\n\r\na bien retournÃ© tous ses documents.', 'email');
> 
> INSERT INTO `letter` (module, code, name, title, content, is_html, message_transport_type)
>-VALUES ('suggestions','NEW_SUGGESTION','New suggestion','New Suggestion','<h3> Suggestion pending approval</h3>
>+VALUES ('suggestions','NEW_SUGGESTION','New suggestion','New suggestion','<h3>Suggestion pending approval</h3>
> <p><h4>Suggested by</h4>
>  <ul>
>    <li><<borrowers.firstname>> <<borrowers.surname>></li>
>@@ -33,20 +33,20 @@ VALUES ('suggestions','NEW_SUGGESTION','New suggestion','New Suggestion','<h3> S
>    <li><<borrowers.email>></li>
>  </ul>
> </p>
>-<p><h4>Item on suggestion</h4>
>+<p><h4>Title suggested</h4>
>  <ul>
>-   <li><b>Library : </b> <<branches.branchname>></li>
>-   <li><b>Title : </b> <<suggestions.title>></li>
>-   <li><b>Author : </b> <<suggestions.author>></li>
>-   <li><b>Copyright date : </b> <<suggestions.copyrightdate>></li>
>-   <li><b>Standard number (ISBN, ISSN or other) : </b> <<suggestions.isbn>></li>
>-   <li><b>Publisher : </b> <<suggestions.publishercode>></li>
>-   <li><b>Collection title : </b> <<suggestions.collectiontitle>></li>
>-   <li><b>Publication place : </b> <<suggestions.place>></li>
>-   <li><b>Quantity : </b> <<suggestions.quantity>></li>
>-   <li><b>Item type : </b>  <<suggestions.itemtype>></li>
>-   <li><b>Reason for suggestion : </b> <<suggestions.patronreason>></li>
>-   <li><b>Notes : </b> <<suggestions.note>></li>
>+   <li><b>Library:</b> <<branches.branchname>></li>
>+   <li><b>Title:</b> <<suggestions.title>></li>
>+   <li><b>Author:</b> <<suggestions.author>></li>
>+   <li><b>Copyright date:</b> <<suggestions.copyrightdate>></li>
>+   <li><b>Standard number (ISBN, ISSN or other):</b> <<suggestions.isbn>></li>
>+   <li><b>Publisher:</b> <<suggestions.publishercode>></li>
>+   <li><b>Collection title:</b> <<suggestions.collectiontitle>></li>
>+   <li><b>Publication place:</b> <<suggestions.place>></li>
>+   <li><b>Quantity:</b> <<suggestions.quantity>></li>
>+   <li><b>Item type:</b>  <<suggestions.itemtype>></li>
>+   <li><b>Reason for suggestion:</b> <<suggestions.patronreason>></li>
>+   <li><b>Notes:</b> <<suggestions.note>></li>
>  </ul>
> </p>',1, 'email');
> 
>@@ -61,8 +61,8 @@ PrÃªts Ã  <<borrowers.title>> <<borrowers.firstname>> <<borrowers.initials>> <<b
> <checkedout>
> <p>
> <<biblio.title>> <br />
>-Code Ã  barres : <<items.barcode>><br />
>-Retour le : <<issues.date_due>><br />
>+Code Ã  barres:<<items.barcode>><br />
>+Retour le:<<issues.date_due>><br />
> </p>
> </checkedout>
> 
>@@ -70,8 +70,8 @@ Retour le : <<issues.date_due>><br />
> <overdue>
> <p>
> <<biblio.title>> <br />
>-Codes Ã  barres : <<items.barcode>><br />
>-Retour le : <<issues.date_due>><br />
>+Codes Ã  barres:<<items.barcode>><br />
>+Retour le:<<issues.date_due>><br />
> </p>
> </overdue>
> 
>@@ -96,11 +96,11 @@ PrÃªts Ã  <<borrowers.title>> <<borrowers.firstname>> <<borrowers.initials>> <<b
> <checkedout>
> <p>
> <<biblio.title>> <br />
>-Code Ã  barres : <<items.barcode>><br />
>-Retour le : <<issues.date_due>><br />
>+Code Ã  barres:<<items.barcode>><br />
>+Retour le:<<issues.date_due>><br />
> </p>
> </checkedout>', 1),
>-('circulation','HOLD_SLIP','Ticket de rÃ©servation','Ticket de rÃ©servation', '<h5>Date : <<today>></h5>
>+('circulation','HOLD_SLIP','Ticket de rÃ©servation','Ticket de rÃ©servation', '<h5>Date:<<today>></h5>
> 
> <h3> Transfert vers/RÃ©servÃ© Ã  <<branches.branchname>></h3>
> 
>@@ -128,7 +128,7 @@ Retour le : <<issues.date_due>><br />
> <pre><<reserves.reservenotes>></pre>
> </p>
> ', 1),
>-('circulation','TRANSFERSLIP','Ticket de transfer','Ticket de transfert', '<h5>Date : <<today>></h5>
>+('circulation','TRANSFERSLIP','Ticket de transfer','Ticket de transfert', '<h5>Date:<<today>></h5>
> 
> <h3>Transfert Ã  <<branches.branchname>></h3>
> 
>diff --git a/installer/data/mysql/it-IT/necessari/notices.sql b/installer/data/mysql/it-IT/necessari/notices.sql
>index 1395c04165..8e8c9ad42d 100644
>--- a/installer/data/mysql/it-IT/necessari/notices.sql
>+++ b/installer/data/mysql/it-IT/necessari/notices.sql
>@@ -15,21 +15,21 @@ Il prestito dei seguenti volumi sta per scadere:
> <<branches.branchname>>', 'email'),
> ('circulation','RENEWAL','Rinnovi','Rinnovi','Per le seguenti copie sono stati rinnovati i prestiti:\r\n----\r\n<<
> biblio.title>>\r\n----\r\nGrazie per aver visitaro <<branches.branchname>>.', 'email'),
>-('reserves', 'HOLD', 'Prenotazione disponibile per il ritiro', 'Prenotazione disponibile per il ritiro a <<branches.branchname>>', 'Salve <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nHai una prenotazione disponibile per il ritiro fino al <<reserves.waitingdate>>:\r\n\r\nTitolo: <<biblio.title>>\r\nAutore: <<biblio.author>>\r\nCopia n. : <<items.copynumber>>\r\nPresso: <<branches.branchname>>\r\n<<branches.branchaddress1>>\r\n<<branches.branchaddress2>>\r\n<<branches.branchaddress3>>\r\n<<branches.branchcity>> <<branches.branchzip>>', 'email'),
>-('reserves', 'HOLD', 'Prenotazione disponibile per il ritiro (stampa)', 'Prenotazione disponibile per il ritiro (stampa)', '<<branches.branchname>>\r\n<<branches.branchaddress1>>\r\n<<branches.branchaddress2>>\r\n\r\n\r\nPrenotazione disponibile per il ritiro\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<<borrowers.firstname>> <<borrowers.surname>>\r\n<<borrowers.address>>\r\n<<borrowers.city>> <<borrowers.zipcode>>\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<<borrowers.firstname>> <<borrowers.surname>> <<borrowers.cardnumber>>\r\n\r\nHai una prenotazione disponibile per il ritiro fino al <<reserves.waitingdate>>:\r\n\r\nTitolo: <<biblio.title>>\r\nAutore: <<biblio.author>>\r\nCopia n. : <<items.copynumber>>\r\n', 'print'),
>+('reserves', 'HOLD', 'Prenotazione disponibile per il ritiro', 'Prenotazione disponibile per il ritiro a <<branches.branchname>>', 'Salve <<borrowers.firstname>> <<borrowers.surname>>,\r\n\r\nHai una prenotazione disponibile per il ritiro fino al <<reserves.waitingdate>>:\r\n\r\nTitolo: <<biblio.title>>\r\nAutore: <<biblio.author>>\r\nCopia n.:<<items.copynumber>>\r\nPresso: <<branches.branchname>>\r\n<<branches.branchaddress1>>\r\n<<branches.branchaddress2>>\r\n<<branches.branchaddress3>>\r\n<<branches.branchcity>> <<branches.branchzip>>', 'email'),
>+('reserves', 'HOLD', 'Prenotazione disponibile per il ritiro (stampa)', 'Prenotazione disponibile per il ritiro (stampa)', '<<branches.branchname>>\r\n<<branches.branchaddress1>>\r\n<<branches.branchaddress2>>\r\n\r\n\r\nPrenotazione disponibile per il ritiro\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<<borrowers.firstname>> <<borrowers.surname>>\r\n<<borrowers.address>>\r\n<<borrowers.city>> <<borrowers.zipcode>>\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<<borrowers.firstname>> <<borrowers.surname>> <<borrowers.cardnumber>>\r\n\r\nHai una prenotazione disponibile per il ritiro fino al <<reserves.waitingdate>>:\r\n\r\nTitolo: <<biblio.title>>\r\nAutore: <<biblio.author>>\r\nCopia n.:<<items.copynumber>>\r\n', 'print'),
> ('circulation','CHECKIN','Restituzione (Digest)','Restituzione','Questi prestiti sono stati restituiti:\r\n----\r\n[% biblio.title %]\r\n----\r\nGrazie.', 'email'),
> ('circulation','CHECKOUT','Prestiti','Prestiti','Ti sono stati dati in prestito:\r\n----\r\n[% biblio.title %]\r\n----\r\nGrazie da parte di [% branch.branchname %].', 'email'),
>-('reserves', 'HOLDPLACED', 'Prenotazione di una copia', 'Prenotazione di una copia','Una prenotazione Ã¨ stata fatta su una copia di : <<biblio.title>> (<<biblio.biblionumber>>) dall\'utente <<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>).', 'email'),
>+('reserves', 'HOLDPLACED', 'Prenotazione di una copia', 'Prenotazione di una copia','Una prenotazione Ã¨ stata fatta su una copia di:<<biblio.title>> (<<biblio.biblionumber>>) dall\'utente <<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>).', 'email'),
> ('reserves', 'CANCEL_HOLD_ON_LOST', 'Hold has been cancelled', "Hold has been cancelled", "Dear [% borrower.firstname %] [% borrower.surname %],\n\nWe regret to inform you, that the following item can not be provided due to it being missing. Your hold was cancelled.\n\nTitle: [% biblio.title %]\nAuthor: [% biblio.author %]\nCopy: [% item.copynumber %]\nLocation: [% branch.branchname %]", 'email'),
> ('suggestions','ACCEPTED','Suggerimento d\'acquisto accettato', 'Suggerimento d\'acquisto accettato','Salve <<borrowers.firstname>> <<borrowers.surname>>,\n\nHai suggerito di acquistare <<suggestions.title>> di <<suggestions.author>>.\n\nLa biblioteca ha revisionato il suggerimento oggi. La copia verrÃ  ordinato il piÃ¹ presto possibile. Riceverai un\'email quando l\'ordine sarÃ  completato e una altra mail quanto arriverÃ  in biblioteca.\n\nSe hai domande, scrivici pure all\' email <<branches.branchemail>>.\n\nGrazie di tutto,\n\n<<branches.branchname>>', 'email'),
> ('suggestions','AVAILABLE','Suggerimento d\'acquisto disponibile', 'Suggerimento d\'acquisto disponibile','Salve <<borrowers.firstname>> <<borrowers.surname>>,\n\nHai suggerito di acquistare <<suggestions.title>> di <<suggestions.author>>.\n\nTi informiamo che la copia Ã¨ arrivata in biblioteca.\n\nSe hai domande, scrivici pure all\' email <<branches.branchemail>>.\n\nGrazie di tutto,\n\n<<branches.branchname>>', 'email'),
> ('suggestions','ORDERED','Suggerimento d\'acquisto ordinato', 'Suggerimento d\'acquisto ordinato','Salve <<borrowers.firstname>> <<borrowers.surname>>,\n\nHai suggerito di acquistare <<suggestions.title>> di <<suggestions.author>>.\n\nTi informiamo che l\'ordine Ã¨ stata inviato al fornitore della biblioteca. Dovrebbe arrivare in poco tempo, poi verrÃ  aggiunto alla collezione della biblioteca.\n\nRiceverai un\'altra email quando sarÃ  disponibile.\n\nSe hai domande, scrivici pure all\' email <<branches.branchemail>>\n\nGrazie di tutto,\n\n<<branches.branchname>>', 'email'),
> ('suggestions','REJECTED','Suggerimento d\'acquisto rifiutato', 'Suggerimento d\'acquisto rifiutato','Salve <<borrowers.firstname>> <<borrowers.surname>>,\n\nHai suggerito di acquistare <<suggestions.title>> di <<suggestions.author>>.\n\na biblioteca ha revisionato il suggerimento oggi e ha deciso di non seguire il suggerimento.\n\nLa motivazione Ã¨: <<suggestions.reason>>\n\nSe hai domande, scrivici pure all\' email <<branches.branchemail>>.\n\nGrazie di tuttp,\n\n<<branches.branchname>>', 'email'),
> ('suggestions','TO_PROCESS','Notifica al proprietario del fondo', 'Un suggeerimento Ã¨ pronto per essere lavorato','Caro bibliotecario <<borrowers.firstname>> <<borrowers.surname>>,\n\n c\'Ã¨ un nuovo suggerimento pronto per essere lavorato: <<suggestions.title>> by <<suggestions.author>>.\n\n Grazie dell\'attenzione,\n\n<<branches.branchname>>', 'email'),
>-('members', 'DISCHARGE', 'Liberatoria', 'Liberatoria per <<borrowers.firstname>> <<borrowers.surname>>', '<h1>Liberatoria</h1>\r\n\r\nLa biblioteca  <<borrowers.branchcode>> certifica che il seguente utente :\r\n\r\n    <<borrowers.firstname>> <<borrowers.surname>>\r\n   Numero tessera : <<borrowers.cardnumber>>\r\n\r\nha restituito tutti i documenti ricevuti.', 'email');
>+('members', 'DISCHARGE', 'Liberatoria', 'Liberatoria per <<borrowers.firstname>> <<borrowers.surname>>', '<h1>Liberatoria</h1>\r\n\r\nLa biblioteca  <<borrowers.branchcode>> certifica che il seguente utente :\r\n\r\n    <<borrowers.firstname>> <<borrowers.surname>>\r\n   Numero tessera:<<borrowers.cardnumber>>\r\n\r\nha restituito tutti i documenti ricevuti.', 'email');
> 
> INSERT INTO `letter` (module, code, name, title, content, is_html, message_transport_type)
>-VALUES ('suggestions','NEW_SUGGESTION','New suggestion','New Suggestion','<h3> Suggestion pending approval</h3>
>+VALUES ('suggestions','NEW_SUGGESTION','New suggestion','New suggestion','<h3>Suggestion pending approval</h3>
> <p><h4>Suggested by</h4>
>  <ul>
>    <li><<borrowers.firstname>> <<borrowers.surname>></li>
>@@ -38,20 +38,20 @@ VALUES ('suggestions','NEW_SUGGESTION','New suggestion','New Suggestion','<h3> S
>    <li><<borrowers.email>></li>
>  </ul>
> </p>
>-<p><h4>Item on suggestion</h4>
>+<p><h4>Title suggested</h4>
>  <ul>
>-   <li><b>Library : </b> <<branches.branchname>></li>
>-   <li><b>Title : </b> <<suggestions.title>></li>
>-   <li><b>Author : </b> <<suggestions.author>></li>
>-   <li><b>Copyright date : </b> <<suggestions.copyrightdate>></li>
>-   <li><b>Standard number (ISBN, ISSN or other) : </b> <<suggestions.isbn>></li>
>-   <li><b>Publisher : </b> <<suggestions.publishercode>></li>
>-   <li><b>Collection title : </b> <<suggestions.collectiontitle>></li>
>-   <li><b>Publication place : </b> <<suggestions.place>></li>
>-   <li><b>Quantity : </b> <<suggestions.quantity>></li>
>-   <li><b>Item type : </b>  <<suggestions.itemtype>></li>
>-   <li><b>Reason for suggestion : </b> <<suggestions.patronreason>></li>
>-   <li><b>Notes : </b> <<suggestions.note>></li>
>+   <li><b>Library:</b> <<branches.branchname>></li>
>+   <li><b>Title:</b> <<suggestions.title>></li>
>+   <li><b>Author:</b> <<suggestions.author>></li>
>+   <li><b>Copyright date:</b> <<suggestions.copyrightdate>></li>
>+   <li><b>Standard number (ISBN, ISSN or other):</b> <<suggestions.isbn>></li>
>+   <li><b>Publisher:</b> <<suggestions.publishercode>></li>
>+   <li><b>Collection title:</b> <<suggestions.collectiontitle>></li>
>+   <li><b>Publication place:</b> <<suggestions.place>></li>
>+   <li><b>Quantity:</b> <<suggestions.quantity>></li>
>+   <li><b>Item type:</b>  <<suggestions.itemtype>></li>
>+   <li><b>Reason for suggestion:</b> <<suggestions.patronreason>></li>
>+   <li><b>Notes:</b> <<suggestions.note>></li>
>  </ul>
> </p>',1, 'email');
> 
>diff --git a/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql b/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql
>index 6cccadfbdb..5efc1e50e7 100644
>--- a/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql
>+++ b/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql
>@@ -35,17 +35,17 @@ VALUES ('circulation','ODUE','Purring','Purring pÃ¥ dokument','<<borrowers.first
> ('reserves', 'HOLD', 'Hentemelding', 'Hentemelding', '<<branches.branchname>>\r\n<<branches.branchaddress1>>\r\n<<branches.branchaddress2>>\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<<borrowers.firstname>> <<borrowers.surname>>\r\n<<borrowers.address>>\r\n<<borrowers.city>> <<borrowers.zipcode>>\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<<borrowers.firstname>> <<borrowers.surname>> <<borrowers.cardnumber>>\r\n\r\nDu har et reservert dokument som kan hentes fra  <<reserves.waitingdate>>:\r\n\r\nTittel: <<biblio.title>>\r\nForfatter: <<biblio.author>>\r\nEksemplar: <<items.copynumber>>\r\n', 'print'),
> ('circulation','CHECKIN','Innlevering','Melding om innlevering','FÃ¸lgende dokument har blitt innlevert:\r\n----\r\n[% biblio.title %]\r\n----\r\nVennlig hilsen\r\nBiblioteket', 'email'),
> ('circulation','CHECKOUT','UtlÃ¥n','Melding om utlÃ¥n','FÃ¸lgende dokument har blitt lÃ¥nt ut:\r\n----\r\n[% biblio.title %]\r\n----\r\nVennlig hilsen\r\nBiblioteket', 'email'),
>-('reserves', 'HOLDPLACED', 'Melding om reservasjon', 'Melding om reservasjon','FÃ¸lgende dokument har blitt reservert : <<biblio.title>> (<<biblio.biblionumber>>) av <<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>).', 'email'),
>+('reserves', 'HOLDPLACED', 'Melding om reservasjon', 'Melding om reservasjon','FÃ¸lgende dokument har blitt reservert:<<biblio.title>> (<<biblio.biblionumber>>) av <<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>).', 'email'),
> ('reserves', 'CANCEL_HOLD_ON_LOST', 'Hold has been cancelled', "Hold has been cancelled", "Dear [% borrower.firstname %] [% borrower.surname %],\n\nWe regret to inform you, that the following item can not be provided due to it being missing. Your hold was cancelled.\n\nTitle: [% biblio.title %]\nAuthor: [% biblio.author %]\nCopy: [% item.copynumber %]\nLocation: [% branch.branchname %]", 'email'),
> ('suggestions','ACCEPTED','Forslag godtatt', 'InnkjÃ¸psforslag godtatt','<<borrowers.firstname>> <<borrowers.surname>>,\n\nDu har foreslÃ¥tt at biblioteket kjÃ¸per inn <<suggestions.title>> av <<suggestions.author>>.\n\nBiblioteket har vurdert forslaget i dag. Dokumentet vil bli bestilt sÃ¥ fort det lar seg gjÃ¸re. Du vil fÃ¥ en ny melding nÃ¥r bestillingen er gjort, og nÃ¥r dokumentet ankommer biblioteket.\n\nEr det noe du lurer pÃ¥, vennligst kontakt oss pÃ¥ <<branches.branchemail>>.\n\nVennlig hilsen,\n\n<<branches.branchname>>', 'email'),
> ('suggestions','AVAILABLE','ForeslÃ¥tt dokument tilgjengelig', 'ForeslÃ¥tt dokument tilgjengelig','<<borrowers.firstname>> <<borrowers.surname>>,\n\nDu har foreslÃ¥tt at biblioteket kjÃ¸per inn <<suggestions.title>> av <<suggestions.author>>.\n\nVi har gleden av Ã¥ informere deg om at dokumentet nÃ¥ er innlemmet i samlingen.\n\nEr det noe du lurer pÃ¥, vennligst kontakt oss pÃ¥ <<branches.branchemail>>.\n\nVennlig hilsen,\n\n<<branches.branchname>>', 'email'),
> ('suggestions','ORDERED','InnkjÃ¸psforslag i bestilling', 'InnkjÃ¸psforslag i bestilling','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nDu har foreslÃ¥tt at biblioteket kjÃ¸per inn <<suggestions.title>> av <<suggestions.author>>.\n\nVi har gleden av Ã¥ informere deg om at dokumentet du foreslo nÃ¥ er i bestilling.\n\nDu vil fÃ¥ en ny melding nÃ¥r dokumentet er tilgjengelig.\n\nEr det noe du lurer pÃ¥, vennligst kontakt oss pÃ¥ <<branches.branchemail>>.\n\nVennlig hilsen,\n\n<<branches.branchname>>', 'email'),
> ('suggestions','REJECTED','InnkjÃ¸psforslag avslÃ¥tt', 'InnkjÃ¸psforslag avslÃ¥tt','<<borrowers.firstname>> <<borrowers.surname>>,\n\nDu har foreslÃ¥tt at biblioteket kjÃ¸per inn <<suggestions.title>> av <<suggestions.author>>.\n\nBiblioteket har vurdert innkjÃ¸psforslaget ditt i dag, og bestemt seg for Ã¥ ikke ta det til fÃ¸lge.\n\nBegrunnelse: <<suggestions.reason>>\n\nEr det noe du lurer pÃ¥, vennligst kontakt oss pÃ¥ <<branches.branchemail>>.\n\nVennlig hilsen,\n\n<<branches.branchname>>', 'email'),
>-('suggestions','TO_PROCESS','Notify fund owner', 'A suggestion is ready to be processed','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nA new suggestion is ready to be processed: <<suggestions.title>> by <<suggestions.author>>.\n\nThank you,\n\n<<branches.branchname>>', 'email'),
>-('members', 'DISCHARGE', 'Discharge', 'Discharge for <<borrowers.firstname>> <<borrowers.surname>>', '<h1>Discharge</h1>\r\n\r\nThe library <<borrowers.branchcode>> certifies that the following borrower :\r\n\r\n    <<borrowers.firstname>> <<borrowers.surname>>\r\n   Cardnumber : <<borrowers.cardnumber>>\r\n\r\nreturned all his documents.', 'email');
>+('suggestions','TO_PROCESS','Notify fund owner', 'A suggestion is ready to be processed','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nA New suggestion is ready to be processed: <<suggestions.title>> by <<suggestions.author>>.\n\nThank you,\n\n<<branches.branchname>>', 'email'),
>+('members', 'DISCHARGE', 'Discharge', 'Discharge for <<borrowers.firstname>> <<borrowers.surname>>', '<h1>Discharge</h1>\r\n\r\nThe library <<borrowers.branchcode>> certifies that the following borrower :\r\n\r\n    <<borrowers.firstname>> <<borrowers.surname>>\r\n   Cardnumber:<<borrowers.cardnumber>>\r\n\r\nreturned all his documents.', 'email');
> 
> INSERT INTO `letter` (module, code, name, title, content, is_html, message_transport_type)
>-VALUES ('suggestions','NEW_SUGGESTION','New suggestion','New Suggestion','<h3> Suggestion pending approval</h3>
>+VALUES ('suggestions','NEW_SUGGESTION','New suggestion','New suggestion','<h3>Suggestion pending approval</h3>
> <p><h4>Suggested by</h4>
>  <ul>
>    <li><<borrowers.firstname>> <<borrowers.surname>></li>
>@@ -54,20 +54,20 @@ VALUES ('suggestions','NEW_SUGGESTION','New suggestion','New Suggestion','<h3> S
>    <li><<borrowers.email>></li>
>  </ul>
> </p>
>-<p><h4>Item on suggestion</h4>
>+<p><h4>Title suggested</h4>
>  <ul>
>-   <li><b>Library : </b> <<branches.branchname>></li>
>-   <li><b>Title : </b> <<suggestions.title>></li>
>-   <li><b>Author : </b> <<suggestions.author>></li>
>-   <li><b>Copyright date : </b> <<suggestions.copyrightdate>></li>
>-   <li><b>Standard number (ISBN, ISSN or other) : </b> <<suggestions.isbn>></li>
>-   <li><b>Publisher : </b> <<suggestions.publishercode>></li>
>-   <li><b>Collection title : </b> <<suggestions.collectiontitle>></li>
>-   <li><b>Publication place : </b> <<suggestions.place>></li>
>-   <li><b>Quantity : </b> <<suggestions.quantity>></li>
>-   <li><b>Item type : </b>  <<suggestions.itemtype>></li>
>-   <li><b>Reason for suggestion : </b> <<suggestions.patronreason>></li>
>-   <li><b>Notes : </b> <<suggestions.note>></li>
>+   <li><b>Library:</b> <<branches.branchname>></li>
>+   <li><b>Title:</b> <<suggestions.title>></li>
>+   <li><b>Author:</b> <<suggestions.author>></li>
>+   <li><b>Copyright date:</b> <<suggestions.copyrightdate>></li>
>+   <li><b>Standard number (ISBN, ISSN or other):</b> <<suggestions.isbn>></li>
>+   <li><b>Publisher:</b> <<suggestions.publishercode>></li>
>+   <li><b>Collection title:</b> <<suggestions.collectiontitle>></li>
>+   <li><b>Publication place:</b> <<suggestions.place>></li>
>+   <li><b>Quantity:</b> <<suggestions.quantity>></li>
>+   <li><b>Item type:</b>  <<suggestions.itemtype>></li>
>+   <li><b>Reason for suggestion:</b> <<suggestions.patronreason>></li>
>+   <li><b>Notes:</b> <<suggestions.note>></li>
>  </ul>
> </p>',1, 'email');
> 
>diff --git a/installer/data/mysql/pl-PL/mandatory/sample_notices.sql b/installer/data/mysql/pl-PL/mandatory/sample_notices.sql
>index a44436af38..b16b4daeb1 100644
>--- a/installer/data/mysql/pl-PL/mandatory/sample_notices.sql
>+++ b/installer/data/mysql/pl-PL/mandatory/sample_notices.sql
>@@ -13,17 +13,17 @@ VALUES ('circulation','ODUE','Overdue Notice','Item Overdue','Dear <<borrowers.f
> ('reserves', 'HOLD', 'Hold Available for Pickup', 'Hold Available for Pickup (print notice)', '<<branches.branchname>>\r\n<<branches.branchaddress1>>\r\n<<branches.branchaddress2>>\r\n\r\n\r\nChange Service Requested\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<<borrowers.firstname>> <<borrowers.surname>>\r\n<<borrowers.address>>\r\n<<borrowers.city>> <<borrowers.zipcode>>\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<<borrowers.firstname>> <<borrowers.surname>> <<borrowers.cardnumber>>\r\n\r\nYou have a hold available for pickup as of <<reserves.waitingdate>>:\r\n\r\nTitle: <<biblio.title>>\r\nAuthor: <<biblio.author>>\r\nCopy: <<items.copynumber>>\r\n', 'print'),
> ('circulation','CHECKIN','Item Check-in (Digest)','Check-ins','The following items have been checked in:\r\n----\r\n[% biblio.title %]\r\n----\r\nThank you.', 'email'),
> ('circulation','CHECKOUT','Item Check-out (Digest)','Checkouts','The following items have been checked out:\r\n----\r\n[% biblio.title %]\r\n----\r\nThank you for visiting [% branch.branchname %].', 'email'),
>-('reserves', 'HOLDPLACED', 'Hold Placed on Item', 'Hold Placed on Item','A hold has been placed on the following item : <<biblio.title>> (<<biblio.biblionumber>>) by the user <<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>).', 'email'),
>+('reserves', 'HOLDPLACED', 'Hold Placed on Item', 'Hold Placed on Item','A hold has been placed on the following item:<<biblio.title>> (<<biblio.biblionumber>>) by the user <<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>).', 'email'),
> ('reserves', 'CANCEL_HOLD_ON_LOST', 'Hold has been cancelled', "Hold has been cancelled", "Dear [% borrower.firstname %] [% borrower.surname %],\n\nWe regret to inform you, that the following item can not be provided due to it being missing. Your hold was cancelled.\n\nTitle: [% biblio.title %]\nAuthor: [% biblio.author %]\nCopy: [% item.copynumber %]\nLocation: [% branch.branchname %]", 'email'),
> ('suggestions','ACCEPTED','Suggestion accepted', 'Purchase suggestion accepted','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nThe library has reviewed your suggestion today. The item will be ordered as soon as possible. You will be notified by mail when the order is completed, and again when the item arrives at the library.\n\nIf you have any questions, please email us at <<branches.branchemail>>.\n\nThank you,\n\n<<branches.branchname>>', 'email'),
> ('suggestions','AVAILABLE','Suggestion available', 'Suggested purchase available','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nWe are pleased to inform you that the item you requested is now part of the collection.\n\nIf you have any questions, please email us at <<branches.branchemail>>.\n\nThank you,\n\n<<branches.branchname>>', 'email'),
> ('suggestions','ORDERED','Suggestion ordered', 'Suggested item ordered','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nWe are pleased to inform you that the item you requested has now been ordered. It should arrive soon, at which time it will be processed for addition into the collection.\n\nYou will be notified again when the book is available.\n\nIf you have any questions, please email us at <<branches.branchemail>>\n\nThank you,\n\n<<branches.branchname>>', 'email'),
> ('suggestions','REJECTED','Suggestion rejected', 'Purchase suggestion declined','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nThe library has reviewed your request today, and has decided not to accept the suggestion at this time.\n\nThe reason given is: <<suggestions.reason>>\n\nIf you have any questions, please email us at <<branches.branchemail>>.\n\nThank you,\n\n<<branches.branchname>>', 'email'),
>-('suggestions','TO_PROCESS','Notify fund owner', 'A suggestion is ready to be processed','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nA new suggestion is ready to be processed: <<suggestions.title>> by <<suggestions.author>>.\n\nThank you,\n\n<<branches.branchname>>', 'email'),
>-('members', 'DISCHARGE', 'Discharge', 'Discharge for <<borrowers.firstname>> <<borrowers.surname>>', '<h1>Discharge</h1>\r\n\r\nThe library <<borrowers.branchcode>> certifies that the following borrower :\r\n\r\n    <<borrowers.firstname>> <<borrowers.surname>>\r\n   Cardnumber : <<borrowers.cardnumber>>\r\n\r\nreturned all his documents.', 'email');
>+('suggestions','TO_PROCESS','Notify fund owner', 'A suggestion is ready to be processed','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nA New suggestion is ready to be processed: <<suggestions.title>> by <<suggestions.author>>.\n\nThank you,\n\n<<branches.branchname>>', 'email'),
>+('members', 'DISCHARGE', 'Discharge', 'Discharge for <<borrowers.firstname>> <<borrowers.surname>>', '<h1>Discharge</h1>\r\n\r\nThe library <<borrowers.branchcode>> certifies that the following borrower :\r\n\r\n    <<borrowers.firstname>> <<borrowers.surname>>\r\n   Cardnumber:<<borrowers.cardnumber>>\r\n\r\nreturned all his documents.', 'email');
> 
> INSERT INTO `letter` (module, code, name, title, content, is_html, message_transport_type)
>-VALUES ('suggestions','NEW_SUGGESTION','New suggestion','New Suggestion','<h3> Suggestion pending approval</h3>
>+VALUES ('suggestions','NEW_SUGGESTION','New suggestion','New suggestion','<h3>Suggestion pending approval</h3>
> <p><h4>Suggested by</h4>
>  <ul>
>    <li><<borrowers.firstname>> <<borrowers.surname>></li>
>@@ -32,20 +32,20 @@ VALUES ('suggestions','NEW_SUGGESTION','New suggestion','New Suggestion','<h3> S
>    <li><<borrowers.email>></li>
>  </ul>
> </p>
>-<p><h4>Item on suggestion</h4>
>+<p><h4>Title suggested</h4>
>  <ul>
>-   <li><b>Library : </b> <<branches.branchname>></li>
>-   <li><b>Title : </b> <<suggestions.title>></li>
>-   <li><b>Author : </b> <<suggestions.author>></li>
>-   <li><b>Copyright date : </b> <<suggestions.copyrightdate>></li>
>-   <li><b>Standard number (ISBN, ISSN or other) : </b> <<suggestions.isbn>></li>
>-   <li><b>Publisher : </b> <<suggestions.publishercode>></li>
>-   <li><b>Collection title : </b> <<suggestions.collectiontitle>></li>
>-   <li><b>Publication place : </b> <<suggestions.place>></li>
>-   <li><b>Quantity : </b> <<suggestions.quantity>></li>
>-   <li><b>Item type : </b>  <<suggestions.itemtype>></li>
>-   <li><b>Reason for suggestion : </b> <<suggestions.patronreason>></li>
>-   <li><b>Notes : </b> <<suggestions.note>></li>
>+   <li><b>Library:</b> <<branches.branchname>></li>
>+   <li><b>Title:</b> <<suggestions.title>></li>
>+   <li><b>Author:</b> <<suggestions.author>></li>
>+   <li><b>Copyright date:</b> <<suggestions.copyrightdate>></li>
>+   <li><b>Standard number (ISBN, ISSN or other):</b> <<suggestions.isbn>></li>
>+   <li><b>Publisher:</b> <<suggestions.publishercode>></li>
>+   <li><b>Collection title:</b> <<suggestions.collectiontitle>></li>
>+   <li><b>Publication place:</b> <<suggestions.place>></li>
>+   <li><b>Quantity:</b> <<suggestions.quantity>></li>
>+   <li><b>Item type:</b>  <<suggestions.itemtype>></li>
>+   <li><b>Reason for suggestion:</b> <<suggestions.patronreason>></li>
>+   <li><b>Notes:</b> <<suggestions.note>></li>
>  </ul>
> </p>',1, 'email');
> 
>diff --git a/installer/data/mysql/ru-RU/mandatory/sample_notices.sql b/installer/data/mysql/ru-RU/mandatory/sample_notices.sql
>index 8bb7c19606..7dd1fabcce 100644
>--- a/installer/data/mysql/ru-RU/mandatory/sample_notices.sql
>+++ b/installer/data/mysql/ru-RU/mandatory/sample_notices.sql
>@@ -12,17 +12,17 @@ VALUES ('circulation','ODUE','Overdue Notice','Item Overdue','Dear <<borrowers.f
> ('reserves', 'HOLD', 'Hold Available for Pickup', 'Hold Available for Pickup (print notice)', '<<branches.branchname>>\r\n<<branches.branchaddress1>>\r\n<<branches.branchaddress2>>\r\n\r\n\r\nChange Service Requested\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<<borrowers.firstname>> <<borrowers.surname>>\r\n<<borrowers.address>>\r\n<<borrowers.city>> <<borrowers.zipcode>>\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<<borrowers.firstname>> <<borrowers.surname>> <<borrowers.cardnumber>>\r\n\r\nYou have a hold available for pickup as of <<reserves.waitingdate>>:\r\n\r\nTitle: <<biblio.title>>\r\nAuthor: <<biblio.author>>\r\nCopy: <<items.copynumber>>\r\n', 'print'),
> ('circulation','CHECKIN','Item Check-in (Digest)','Check-ins','The following items have been checked in:\r\n----\r\n[% biblio.title %]\r\n----\r\nThank you.', 'email'),
> ('circulation','CHECKOUT','Item Check-out (Digest)','Checkouts','The following items have been checked out:\r\n----\r\n[% biblio.title %]\r\n----\r\nThank you for visiting [% branch.branchname %].', 'email'),
>-('reserves', 'HOLDPLACED', 'Hold Placed on Item', 'Hold Placed on Item','A hold has been placed on the following item : <<biblio.title>> (<<biblio.biblionumber>>) by the user <<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>).', 'email'),
>+('reserves', 'HOLDPLACED', 'Hold Placed on Item', 'Hold Placed on Item','A hold has been placed on the following item:<<biblio.title>> (<<biblio.biblionumber>>) by the user <<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>).', 'email'),
> ('reserves', 'CANCEL_HOLD_ON_LOST', 'Hold has been cancelled', "Hold has been cancelled", "Dear [% borrower.firstname %] [% borrower.surname %],\n\nWe regret to inform you, that the following item can not be provided due to it being missing. Your hold was cancelled.\n\nTitle: [% biblio.title %]\nAuthor: [% biblio.author %]\nCopy: [% item.copynumber %]\nLocation: [% branch.branchname %]", 'email'),
> ('suggestions','ACCEPTED','Suggestion accepted', 'Purchase suggestion accepted','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nThe library has reviewed your suggestion today. The item will be ordered as soon as possible. You will be notified by mail when the order is completed, and again when the item arrives at the library.\n\nIf you have any questions, please email us at <<branches.branchemail>>.\n\nThank you,\n\n<<branches.branchname>>', 'email'),
> ('suggestions','AVAILABLE','Suggestion available', 'Suggested purchase available','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nWe are pleased to inform you that the item you requested is now part of the collection.\n\nIf you have any questions, please email us at <<branches.branchemail>>.\n\nThank you,\n\n<<branches.branchname>>', 'email'),
> ('suggestions','ORDERED','Suggestion ordered', 'Suggested item ordered','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nWe are pleased to inform you that the item you requested has now been ordered. It should arrive soon, at which time it will be processed for addition into the collection.\n\nYou will be notified again when the book is available.\n\nIf you have any questions, please email us at <<branches.branchemail>>\n\nThank you,\n\n<<branches.branchname>>', 'email'),
> ('suggestions','REJECTED','Suggestion rejected', 'Purchase suggestion declined','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nYou have suggested that the library acquire <<suggestions.title>> by <<suggestions.author>>.\n\nThe library has reviewed your request today, and has decided not to accept the suggestion at this time.\n\nThe reason given is: <<suggestions.reason>>\n\nIf you have any questions, please email us at <<branches.branchemail>>.\n\nThank you,\n\n<<branches.branchname>>', 'email'),
>-('suggestions','TO_PROCESS','Notify fund owner', 'A suggestion is ready to be processed','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nA new suggestion is ready to be processed: <<suggestions.title>> by <<suggestions.author>>.\n\nThank you,\n\n<<branches.branchname>>', 'email'),
>-('members', 'DISCHARGE', 'Discharge', 'Discharge for <<borrowers.firstname>> <<borrowers.surname>>', '<h1>Discharge</h1>\r\n\r\nThe library <<borrowers.branchcode>> certifies that the following borrower :\r\n\r\n    <<borrowers.firstname>> <<borrowers.surname>>\r\n   Cardnumber : <<borrowers.cardnumber>>\r\n\r\nreturned all his documents.', 'email');
>+('suggestions','TO_PROCESS','Notify fund owner', 'A suggestion is ready to be processed','Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\nA New suggestion is ready to be processed: <<suggestions.title>> by <<suggestions.author>>.\n\nThank you,\n\n<<branches.branchname>>', 'email'),
>+('members', 'DISCHARGE', 'Discharge', 'Discharge for <<borrowers.firstname>> <<borrowers.surname>>', '<h1>Discharge</h1>\r\n\r\nThe library <<borrowers.branchcode>> certifies that the following borrower :\r\n\r\n    <<borrowers.firstname>> <<borrowers.surname>>\r\n   Cardnumber:<<borrowers.cardnumber>>\r\n\r\nreturned all his documents.', 'email');
> 
> INSERT INTO `letter` (module, code, name, title, content, is_html, message_transport_type)
>-VALUES ('suggestions','NEW_SUGGESTION','New suggestion','New Suggestion','<h3> Suggestion pending approval</h3>
>+VALUES ('suggestions','NEW_SUGGESTION','New suggestion','New suggestion','<h3>Suggestion pending approval</h3>
> <p><h4>Suggested by</h4>
>  <ul>
>    <li><<borrowers.firstname>> <<borrowers.surname>></li>
>@@ -31,20 +31,20 @@ VALUES ('suggestions','NEW_SUGGESTION','New suggestion','New Suggestion','<h3> S
>    <li><<borrowers.email>></li>
>  </ul>
> </p>
>-<p><h4>Item on suggestion</h4>
>+<p><h4>Title suggested</h4>
>  <ul>
>-   <li><b>Library : </b> <<branches.branchname>></li>
>-   <li><b>Title : </b> <<suggestions.title>></li>
>-   <li><b>Author : </b> <<suggestions.author>></li>
>-   <li><b>Copyright date : </b> <<suggestions.copyrightdate>></li>
>-   <li><b>Standard number (ISBN, ISSN or other) : </b> <<suggestions.isbn>></li>
>-   <li><b>Publisher : </b> <<suggestions.publishercode>></li>
>-   <li><b>Collection title : </b> <<suggestions.collectiontitle>></li>
>-   <li><b>Publication place : </b> <<suggestions.place>></li>
>-   <li><b>Quantity : </b> <<suggestions.quantity>></li>
>-   <li><b>Item type : </b>  <<suggestions.itemtype>></li>
>-   <li><b>Reason for suggestion : </b> <<suggestions.patronreason>></li>
>-   <li><b>Notes : </b> <<suggestions.note>></li>
>+   <li><b>Library:</b> <<branches.branchname>></li>
>+   <li><b>Title:</b> <<suggestions.title>></li>
>+   <li><b>Author:</b> <<suggestions.author>></li>
>+   <li><b>Copyright date:</b> <<suggestions.copyrightdate>></li>
>+   <li><b>Standard number (ISBN, ISSN or other):</b> <<suggestions.isbn>></li>
>+   <li><b>Publisher:</b> <<suggestions.publishercode>></li>
>+   <li><b>Collection title:</b> <<suggestions.collectiontitle>></li>
>+   <li><b>Publication place:</b> <<suggestions.place>></li>
>+   <li><b>Quantity:</b> <<suggestions.quantity>></li>
>+   <li><b>Item type:</b>  <<suggestions.itemtype>></li>
>+   <li><b>Reason for suggestion:</b> <<suggestions.patronreason>></li>
>+   <li><b>Notes:</b> <<suggestions.note>></li>
>  </ul>
> </p>',1, 'email');
> 
>diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
>index 0b5558b79d..d886b025c1 100644
>--- a/installer/data/mysql/sysprefs.sql
>+++ b/installer/data/mysql/sysprefs.sql
>@@ -157,9 +157,9 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
> ('EasyAnalyticalRecords','0','','If on, display in the catalogue screens tools to easily setup analytical record relationships','YesNo'),
> ('ElasticsearchIndexStatus_authorities', '0', 'Authorities index status', NULL, NULL),
> ('ElasticsearchIndexStatus_biblios', '0', 'Biblios index status', NULL, NULL),
>-('emailLibrarianWhenHoldIsPlaced','0',NULL,'If ON, emails the librarian whenever a hold is placed','YesNo'),
>-('EmailPurchaseSuggestions','KohaAdminEmailAddress','EmailAddressForSuggestions|BranchEmailAddress|KohaAdminEmailAddress','Choose email address that will be sent new purchase suggestions','Choice'),
> ('EmailAddressForSuggestions','','','If you choose EmailAddressForSuggestions you should enter a valid email address','free'),
>+('emailLibrarianWhenHoldIsPlaced','0',NULL,'If ON, emails the librarian whenever a hold is placed','YesNo'),
>+('EmailPurchaseSuggestions','KohaAdminEmailAddress','EmailAddressForSuggestions|BranchEmailAddress|KohaAdminEmailAddress','Choose email address that new purchase suggestions will be sent to','Choice'),
> ('EnableAdvancedCatalogingEditor','0','','Enable the Rancor advanced cataloging editor','YesNo'),
> ('EnableBorrowerFiles','0',NULL,'If enabled, allows librarians to upload and attach arbitrary files to a borrower record.','YesNo'),
> ('EnableOpacSearchHistory','1','YesNo','Enable or disable opac search history',''),
>diff --git a/installer/data/mysql/uk-UA/mandatory/sample_notices.sql b/installer/data/mysql/uk-UA/mandatory/sample_notices.sql
>index 0c83a7ef2b..513d226511 100644
>--- a/installer/data/mysql/uk-UA/mandatory/sample_notices.sql
>+++ b/installer/data/mysql/uk-UA/mandatory/sample_notices.sql
>@@ -85,7 +85,7 @@ INSERT INTO `letter` (module, code, name, title, content, message_transport_type
> ;
> 
> INSERT INTO `letter` (module, code, name, title, content, is_html, message_transport_type)
>-VALUES ('suggestions','NEW_SUGGESTION','New suggestion','New Suggestion','<h3> Suggestion pending approval</h3>
>+VALUES ('suggestions','NEW_SUGGESTION','New suggestion','New suggestion','<h3>Suggestion pending approval</h3>
> <p><h4>Suggested by</h4>
>  <ul>
>    <li><<borrowers.firstname>> <<borrowers.surname>></li>
>@@ -94,20 +94,20 @@ VALUES ('suggestions','NEW_SUGGESTION','New suggestion','New Suggestion','<h3> S
>    <li><<borrowers.email>></li>
>  </ul>
> </p>
>-<p><h4>Item on suggestion</h4>
>+<p><h4>Title suggested</h4>
>  <ul>
>-   <li><b>Library : </b> <<branches.branchname>></li>
>-   <li><b>Title : </b> <<suggestions.title>></li>
>-   <li><b>Author : </b> <<suggestions.author>></li>
>-   <li><b>Copyright date : </b> <<suggestions.copyrightdate>></li>
>-   <li><b>Standard number (ISBN, ISSN or other) : </b> <<suggestions.isbn>></li>
>-   <li><b>Publisher : </b> <<suggestions.publishercode>></li>
>-   <li><b>Collection title : </b> <<suggestions.collectiontitle>></li>
>-   <li><b>Publication place : </b> <<suggestions.place>></li>
>-   <li><b>Quantity : </b> <<suggestions.quantity>></li>
>-   <li><b>Item type : </b>  <<suggestions.itemtype>></li>
>-   <li><b>Reason for suggestion : </b> <<suggestions.patronreason>></li>
>-   <li><b>Notes : </b> <<suggestions.note>></li>
>+   <li><b>Library:</b> <<branches.branchname>></li>
>+   <li><b>Title:</b> <<suggestions.title>></li>
>+   <li><b>Author:</b> <<suggestions.author>></li>
>+   <li><b>Copyright date:</b> <<suggestions.copyrightdate>></li>
>+   <li><b>Standard number (ISBN, ISSN or other):</b> <<suggestions.isbn>></li>
>+   <li><b>Publisher:</b> <<suggestions.publishercode>></li>
>+   <li><b>Collection title:</b> <<suggestions.collectiontitle>></li>
>+   <li><b>Publication place:</b> <<suggestions.place>></li>
>+   <li><b>Quantity:</b> <<suggestions.quantity>></li>
>+   <li><b>Item type:</b>  <<suggestions.itemtype>></li>
>+   <li><b>Reason for suggestion:</b> <<suggestions.patronreason>></li>
>+   <li><b>Notes:</b> <<suggestions.note>></li>
>  </ul>
> </p>',1, 'email');
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref
>index dc2ff58b21..ea0476355f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref
>@@ -7,14 +7,14 @@ Administration:
>               class: email
>             - "(This is the default From: address for emails unless there is one for the particular library, and is referred to when an internal error occurs.)"
>         -
>-            - "Choose email address that will be sent new purchase suggestions : "
>+            - "Choose email address that new purchase suggestions will be sent to: "
>             - pref:   EmailPurchaseSuggestions
>               default: KohaAdminEmailAddress
>               choices:
>                   EmailAddressForSuggestions: EmailAddressForSuggestions
>                   BranchEmailAddress: email address of branch
>                   KohaAdminEmailAddress: KohaAdminEmailAddress
>-            - "If you choose EmailAddressForSuggestions you should enter a valid email address : "
>+            - "If you choose EmailAddressForSuggestions you have to enter a valid email address: "
>             - pref: EmailAddressForSuggestions
>               class: email
>         -
>-- 
>2.17.1

Actions: View | Diff | Splinter Review

Attachments on bug 5770: 83384 | 83385 | 83386 | 83387 | 83388 | 83390 | 83615 | 83616 | 83617 | 84463 | 84812 | 89139 | 89140 | 89141 | 89142 | 89144 | 89145 | 89146 | 89147 | 89188 | 89189 | 89190 | 89191 | 89192 | 89193 | 89194 | 89195