From 2d16b723d12d2d7a17f09787d5fd3c2782df7803 Mon Sep 17 00:00:00 2001
From: Joshua Ferraro <jmf@liblime.com>
Date: Sun, 11 Nov 2007 22:10:56 -0600
Subject: [PATCH] Improvements to nomenclature and translations

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
---
 .../admin/auth_subfields_structure.tmpl       |  6 ++--
 .../prog/en/modules/admin/categorie.tmpl      | 24 +++++++-------
 .../prog/en/modules/admin/classsources.tmpl   |  6 ++--
 .../admin/marc_subfields_structure.tmpl       | 18 +++++------
 .../prog/en/modules/catalogue/advsearch.tmpl  | 12 +++----
 .../prog/en/modules/catalogue/detail.tmpl     |  4 +--
 .../value_builder/marc21_field_008.tmpl       |  4 +--
 .../marc21_field_008_authorities.tmpl         |  4 +--
 .../prog/en/modules/circ/branchoverdues.tmpl  | 10 +++---
 .../en/modules/help/admin/aqbookfund.tmpl     |  2 +-
 .../prog/en/modules/help/admin/categorie.tmpl | 15 ++++-----
 .../modules/help/admin/systempreferences.tmpl | 31 ++++++++++---------
 .../modules/help/bull/subscription-add.tmpl   |  2 +-
 .../prog/en/modules/labels/label-print.tmpl   | 14 ++++-----
 .../prog/en/modules/reports/dictionary.tmpl   | 10 +++---
 .../modules/serials/serials-collection.tmpl   |  3 +-
 .../en/modules/serials/serials-recieve.tmpl   |  6 ++--
 .../en/modules/serials/subscription-add.tmpl  | 12 +++----
 .../prog/en/modules/tools/export.tmpl         |  2 +-
 .../prog/en/modules/tools/letter.tmpl         |  2 +-
 misc/translator/rebuild_lang.sh               | 10 +++---
 misc/translator/xgettext.pl                   |  2 +-
 22 files changed, 98 insertions(+), 101 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl
index d7609ffe52..3ef171c93f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl
@@ -37,10 +37,10 @@
 	<li><label for="ihidden<!-- TMPL_VAR NAME="row" -->">Intranet:</label><!-- TMPL_VAR name="ihidden" --> </li>
 	<li><label for="ehidden<!-- TMPL_VAR NAME="row" -->">Editor:</label><!-- TMPL_VAR name="ehidden" --> (see online help)</li>
 </ol></fieldset></li>
-            <li><label for="isurl<!-- TMPL_VAR NAME="row" -->">Is a URL: </label><!-- TMPL_VAR NAME="isurl" --> (if checked, it means that the subfield is an URL and can be clicked)</li>
+            <li><label for="isurl<!-- TMPL_VAR NAME="row" -->">Is a URL:</label><!-- TMPL_VAR NAME="isurl" --> (if checked, it means that the subfield is a URL and can be clicked)</li>
             <li><fieldset><legend>Help input</legend>	
             <ol>
-                <li><label for="authorised_value<!-- TMPL_VAR NAME="row" -->">Authorized Value:</label> <!-- TMPL_VAR NAME="authorised_value" --></li>
+                <li><label for="authorised_value<!-- TMPL_VAR NAME="row" -->">Authorized value:</label> <!-- TMPL_VAR NAME="authorised_value" --></li>
                 <li><label for="frameworkcode<!-- TMPL_VAR NAME="row" -->">Thesaurus:</label> <!-- TMPL_VAR NAME="frameworkcode" --></li>
                 <li><label for="value_builder<!-- TMPL_VAR NAME="row" -->">Plugin:</label> <!-- TMPL_VAR NAME="value_builder" --></li>
             </ol></fieldset></li> </ol></fieldset>
@@ -116,7 +116,7 @@
                 <!-- /TMPL_IF -->
                         <!-- TMPL_IF NAME="hidden" -->hidden,
                 <!-- /TMPL_IF -->
-                        <!-- TMPL_IF NAME="isurl" -->is an url,
+                        <!-- TMPL_IF NAME="isurl" -->is a URL,
                 <!-- /TMPL_IF -->
                         <!-- TMPL_IF NAME="authorised_value" --> | <strong>Auth value:</strong><!-- TMPL_VAR NAME="authorised_value" -->,
                 <!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl
index a39b06ba2e..a7461d9092 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl
@@ -109,7 +109,7 @@
 	<li><label for="enrolmentperiod">Enrollment period: </label> &nbsp; <input type="text" name="enrolmentperiod" id="enrolmentperiod" size="2" maxlength="2" value="<!-- TMPL_VAR NAME="enrolmentperiod" -->" /> months</li>
 	<li><label for="dateofbirthrequired">Age required: </label> &nbsp; <input type="text" name="dateofbirthrequired" id="dateofbirthrequired" value="<!-- TMPL_VAR NAME="dateofbirthrequired" -->" size="3" maxlength="3" /> years</li>
 	<li><label for="upperagelimit">Upperage limit: </label> &nbsp; <input type="text" name="upperagelimit" id="upperagelimit" size="3" maxlength="3" value="<!-- TMPL_VAR NAME="upperagelimit" -->" /> years</li>
-	<li><label for="enrolmentfee">Enrollment fee: </label>$ <input type="text" name="enrolmentfee" id="enrolmentfee" size="6" value="<!-- TMPL_VAR NAME="enrolmentfee" -->" /></li>
+	<li><label for="enrolmentfee">Enrollment fee: </label>$<input type="text" name="enrolmentfee" id="enrolmentfee" size="6" value="<!-- TMPL_VAR NAME="enrolmentfee" -->" /></li>
 	<li><label for="overduenoticerequired">Overdue notice required: </label> &nbsp; <select name="overduenoticerequired" id="overduenoticerequired">
 			<!-- TMPL_IF NAME="overduenoticerequired" -->
 						<option value="0">No</option>
@@ -119,7 +119,7 @@
 						<option value="1">Yes</option>
 			<!-- /TMPL_IF -->
 					</select></li>
-	<li><label for="reservefee">Reserve fee: </label>$ <input type="text" name="reservefee" id="reservefee" size="6" value="<!-- TMPL_VAR NAME="reservefee" -->" /></li>
+	<li><label for="reservefee">Reserve fee: </label>$<input type="text" name="reservefee" id="reservefee" size="6" value="<!-- TMPL_VAR NAME="reservefee" -->" /></li>
 	<li><label for="category_type">Category type: </label> &nbsp; <select name="category_type" id="category_type">
 						<!-- TMPL_IF NAME="type_n" --><option value="" selected="selected">Select a Category type</option><!-- TMPL_ELSE --><option value="">Select a Category type</option><!-- /TMPL_IF -->
 					<!-- TMPL_IF NAME="type_A" --><option value="A" selected="selected">Adult</option><!-- TMPL_ELSE --><option value="A">Adult</option><!-- /TMPL_IF -->
@@ -155,7 +155,7 @@ Confirm Deletion of Category <!-- TMPL_VAR NAME="categorycode" --><!-- /TMPL_IF
 	<tr><th scope="row">Category code: </th><td><!-- TMPL_VAR NAME="categorycode" --></td></tr>
 	<tr><th scope="row">Description: </th><td><!-- TMPL_VAR NAME="description" --></td></tr>
 	<tr><th scope="row">Enrolment period: </th><td><!-- TMPL_VAR NAME="enrolmentperiod" --> months</td></tr>
-	<tr><th scope="row">Age Required: </th><td><!-- TMPL_VAR NAME="dateofbirthrequired" --> years</td></tr>
+	<tr><th scope="row">Age required: </th><td><!-- TMPL_VAR NAME="dateofbirthrequired" --> years</td></tr>
 	<tr><th scope="row">Upperage limit: </th><td><!-- TMPL_VAR NAME="upperagelimit" --> years</td></tr>
 	<tr><th scope="row">Enrolment fee: </th><td>$<!-- TMPL_VAR NAME="enrolmentfee" --></td></tr>
 	<tr><th scope="row">Overdue notice required: </th><td><!-- TMPL_IF NAME="overduenoticerequired" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td></tr>
@@ -208,15 +208,15 @@ Confirm Deletion of Category <!-- TMPL_VAR NAME="categorycode" --><!-- /TMPL_IF
 
         <table>
 		<tr>
-			<th scope="col">Code</th>
-			<th scope="col">Category Name</th>
-			<th scope="col">Type</th>
-			<th scope="col">Enrollment Period</th>
-			<th scope="col">Age Required</th>
-			<th scope="col">Upper Age Limit</th>
-			<th scope="col">Enrollment Fee</th>
-			<th scope="col">Overdue</th>
- 			<th scope="col">Reservation Fee</th>
+			<th scope="col">Code:</th>
+			<th scope="col">Category name:</th>
+			<th scope="col">Type:</th>
+			<th scope="col">Enrollment period:</th>
+			<th scope="col">Age required:</th>
+			<th scope="col">Upper age limit:</th>
+			<th scope="col">Enrollment fee:</th>
+			<th scope="col">Overdue:</th>
+ 			<th scope="col">Reservation fee:</th>
 			<th scope="col" colspan="2">&nbsp; </th>
 		</tr>
 		<!-- TMPL_LOOP NAME="loop" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tmpl
index 2622dd38fb..f9c4fd4402 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tmpl
@@ -305,8 +305,7 @@ remove it from all classification source definitions before trying again.
     <td><!-- TMPL_VAR name="sortrule" --></td>
     <td>
       <a href="<!-- TMPL_VAR name="script_name" -->?op=edit_source&amp;class_source=<!-- TMPL_VAR name="code" escape="HTML" -->">Edit</a>
-      <a href="<!-- TMPL_VAR name="script_name" -->?op=delete_source&amp;class_source=<!-- TMPL_VAR name="code" escape="HTML" -->">
-Delete</a>
+      <a href="<!-- TMPL_VAR name="script_name" -->?op=delete_source&amp;class_source=<!-- TMPL_VAR name="code" escape="HTML" -->">Delete</a>
     </td>
   </tr>
   <!-- /TMPL_LOOP -->
@@ -339,8 +338,7 @@ Delete</a>
     <td><!-- TMPL_VAR name="sort_routine" --></td>
     <td>
       <a href="<!-- TMPL_VAR name="script_name" -->?op=edit_sort_rule&amp;sort_rule=<!-- TMPL_VAR name="rule" escape="HTML" -->">Edit</a>
-      <a href="<!-- TMPL_VAR name="script_name" -->?op=delete_sort_rule&amp;sort_rule=<!-- TMPL_VAR name="rule" escape="HTML" -->">
-Delete</a>
+      <a href="<!-- TMPL_VAR name="script_name" -->?op=delete_sort_rule&amp;sort_rule=<!-- TMPL_VAR name="rule" escape="HTML" -->">Delete</a>
     </td>
   </tr>
   <!-- /TMPL_LOOP -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl
index a6a2c46475..68d9d3454e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl
@@ -86,20 +86,20 @@ function displayMoreConstraint(numlayer){
             <a href="javascript:displayMoreConstraint('more<!-- TMPL_VAR NAME="subfieldcode" -->')">display more constraints</a>
             <div id="more<!-- TMPL_VAR NAME="subfieldcode" -->" class="content_hidden" style="clear: both">
              <fieldset class="rows" id="advanced-constraints">
-				<legend>Advanced constraints</legend>
-                <ol><li><label for="defaultvalue">Default value</label>
+				<legend>Advanced constraints:</legend>
+                <ol><li><label for="defaultvalue">Default value:</label>
                     <input type="text" name="defaultvalue" id="defaultvalue" value="<!-- TMPL_VAR NAME="defaultvalue" -->" /></li>
                 <li><label for="hidden<!-- TMPL_VAR NAME="row" -->">hidden</label><input type="text" id="hidden<!-- TMPL_VAR NAME="row" -->" name="hidden" value="<!-- TMPL_VAR name="hidden" -->" size="2" /> (see online help)</li>
-                <li><label for="isurl<!-- TMPL_VAR NAME="row" -->">Is a URL</label><!-- TMPL_VAR NAME="isurl" --> (if checked, it means that the subfield is an URL and can be clicked</li>
-                <li><label for="link">Link</label><input type="text" id="link" name="link" value="<!-- TMPL_VAR NAME="link" -->" size="10" maxlength="5" /> (example:200b)</li>
+                <li><label for="isurl<!-- TMPL_VAR NAME="row" -->">Is a URL:</label><!-- TMPL_VAR NAME="isurl" --> (if checked, it means that the subfield is a URL and can be clicked</li>
+                <li><label for="link">Link:</label><input type="text" id="link" name="link" value="<!-- TMPL_VAR NAME="link" -->" size="10" maxlength="5" /> (example:200b)</li>
                 <li><span class="label">Others Options:</span> (choose one)
                     	<ol>
-                    		<li><label for="authorised_value">Authorized Value</label><!-- TMPL_VAR NAME="authorised_value" --></li>
-                    		<li><label for="authtypecode">Thesaurus</label><!-- TMPL_VAR NAME="authtypes" --></li>
-                    		<li><label for="value_builder">Plugin</label><!-- TMPL_VAR NAME="value_builder" --></li>
+                    		<li><label for="authorised_value">Authorized value:</label><!-- TMPL_VAR NAME="authorised_value" --></li>
+                    		<li><label for="authtypecode">Thesaurus:</label><!-- TMPL_VAR NAME="authtypes" --></li>
+                    		<li><label for="value_builder">Plugin:</label><!-- TMPL_VAR NAME="value_builder" --></li>
                     	</ol>
                 </li>
-                <li><label for="kohafield<!-- TMPL_VAR NAME="row" -->">Koha link</label><!-- TMPL_VAR NAME="kohafield" --></li>
+                <li><label for="kohafield<!-- TMPL_VAR NAME="row" -->">Koha link:</label><!-- TMPL_VAR NAME="kohafield" --></li>
 				</ol>
 				</fieldset>
             </div><br class="clear" /><!-- /more  -->
@@ -174,7 +174,7 @@ function displayMoreConstraint(numlayer){
             <!-- TMPL_IF NAME="mandatory" -->Mandatory, <!-- TMPL_ELSE -->Not mandatory,<!-- /TMPL_IF -->
             <!-- TMPL_IF NAME="seealso" --> | See Also: <!-- TMPL_VAR NAME="seealso" -->,<!-- /TMPL_IF -->
             <!-- TMPL_IF NAME="hidden" -->hidden,<!-- /TMPL_IF -->
-            <!-- TMPL_IF NAME="isurl" -->is an url,<!-- /TMPL_IF -->
+            <!-- TMPL_IF NAME="isurl" -->is a URL,<!-- /TMPL_IF -->
             <!-- TMPL_IF NAME="authorised_value" --> | Auth value:<!-- TMPL_VAR NAME="authorised_value" -->,<!-- /TMPL_IF -->
             <!-- TMPL_IF NAME="authtypecode" --> | Authority:<!-- TMPL_VAR NAME="authtypecode" -->,<!-- /TMPL_IF -->
             <!-- TMPL_IF NAME="value_builder" --> | Plugin:<!-- TMPL_VAR NAME="value_builder" -->,<!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl
index 9e36748a9d..509a5fe154 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl
@@ -202,17 +202,17 @@
         <legend>Subtype limits:</legend><p>
         
         <select name="limit" class="subtype">
-            <option value="" selected="selected" class="menuheader">Any Audience</option>
+            <option value="" selected="selected" class="menuheader">Any audience</option>
             <option value="aud:a" >Easy</option>
             <option value="aud:c" >Juvenile</option>
-            <option value="aud:d" >Young Adult</option>
+            <option value="aud:d" >Young adult</option>
             <option value="aud:e" >Adult</option>
         </select>
         
         <select name="limit" class="subtype">
-            <option value="" selected="selected" class="menuheader">Any Content</option>
+            <option value="" selected="selected" class="menuheader">Any content</option>
             <option value="fic:1" >Fiction</option>
-            <option value="fic:0" >Non Fiction</option>
+            <option value="fic:0" >Non fiction</option>
             <option value="bio:b" >Biography</option>
             <option value="mus:j" >Musical recording</option>
             <option value="mus:i" >Non-musical recording</option>
@@ -220,7 +220,7 @@
 
         
         <select name="limit" class="subtype">
-            <option value="" selected="selected" class="menuheader">Any Format</option>
+            <option value="" selected="selected" class="menuheader">Any format</option>
             <option value="l-format:ta" >Regular print</option>
             <option value="l-format:tb" >Large print</option>
             <option value="l-format:fk" >Braille</option>
@@ -234,7 +234,7 @@
         </select>
         
         <select name="limit" class="subtype">
-            <option value="" >Additional Content Types</option>
+            <option value="" >Additional content types</option>
             <option value="ctype:a" >Abstracts/summaries</option>
             <option value="ctype:b" >Bibliographies</option>
             <option value="ctype:c" >Catalogs</option>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
index 2aa9950c95..303f35b45f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
@@ -91,9 +91,7 @@
             <li><strong>Subjects:</strong> 
             <ul>
                 <!-- TMPL_LOOP NAME="MARCSUBJCTS" -->
- <li><!-- TMPL_LOOP NAME="MARCSUBJECT_SUBFIELDS_LOOP" -->
-          <!-- TMPL_VAR NAME="separator" --><a title="$<!-- TMPL_VAR NAME="code" --> <!-- TMPL_VAR NAME="value" -->" href="/cgi-bin/koha/catalogue/search.pl?q=<!-- TMPL_LOOP NAME="link_loop" --><!-- TMPL_VAR NAME="operator" -->su:'<!-- TMPL_VAR NAME="link" -->'<!-- /TMPL_LOOP -->"><!-- TMPL_VAR NAME="value" --></a>    <!-- /TMPL_LOOP --></li>
-
+ 				<li><!-- TMPL_LOOP NAME="MARCSUBJECT_SUBFIELDS_LOOP" --><!-- TMPL_VAR NAME="separator" --><a title="‡<!-- TMPL_VAR NAME=code --> <!-- TMPL_VAR NAME=value -->" href="/cgi-bin/koha/catalogue/search.pl?q=<!-- TMPL_LOOP NAME=link_loop --><!-- TMPL_VAR NAME=operator -->su:'<!-- TMPL_VAR NAME=link -->'<!-- /TMPL_LOOP -->"><!-- TMPL_VAR NAME="value" --></a><!-- /TMPL_LOOP --></li>
                 <!-- /TMPL_LOOP -->
 				</ul>
             </li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl
index bd9d55bdbc..302fd60ea2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl
@@ -535,9 +535,9 @@
                 <td>                
 		<select name="f38" size="1">                        			
 			<!-- TMPL_IF name="f380" -->
-                        <option value=" " SELECTED>#- Not Modified</option>
+                        <option value=" " SELECTED>#- Not modified</option>
                         <!-- TMPL_ELSE -->
-                        <option value=" ">#- Not Modified</option>
+                        <option value=" ">#- Not modified</option>
                         <!-- /TMPL_IF -->
 			
 			<!-- TMPL_IF name="f38s" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl
index e5b1eff6d5..b8bd53cb55 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl
@@ -534,9 +534,9 @@
                 <td>                
 		<select name="f38" size="1">                        			
 			<!-- TMPL_IF name="f380" -->
-                        <option value=" " SELECTED>#- Not Modified</option>
+                        <option value=" " SELECTED>#- Not modified</option>
                         <!-- TMPL_ELSE -->
-                        <option value=" ">#- Not Modified</option>
+                        <option value=" ">#- Not modified</option>
                         <!-- /TMPL_IF -->
 			
 			<!-- TMPL_IF name="f38s" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl
index 39cf4b76aa..062e448dd2 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl
@@ -90,7 +90,7 @@
                     <td align="center">
                     <!-- TMPL_IF NAME="overdue1" -->
                         <!-- TMPL_IF NAME="borroweremail" -->
-                            <a href="branchoverdues.pl?action=add&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber"-->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->&amp;method=mail&amp;location=<!-- TMPL_VAR NAME="location" -->&amp;overduelevel=<!-- TMPL_VAR NAME="overdueLevel" -->&amp;notifyId=<!-- TMPL_VAR NAME="notify_id" -->">mail</a>
+                            <a href="branchoverdues.pl?action=add&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber"-->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->&amp;method=mail&amp;location=<!-- TMPL_VAR NAME="location" -->&amp;overduelevel=<!-- TMPL_VAR NAME="overdueLevel" -->&amp;notifyId=<!-- TMPL_VAR NAME="notify_id" -->">Mail</a>
                         <!-- TMPL_ELSE -->
                             mail
                         <!-- /TMPL_IF -->
@@ -99,11 +99,11 @@
                             ">phone</a>
                             &nbsp;|&nbsp;
                             <a href="branchoverdues.pl?action=add&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber"-->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->&amp;method=letter&amp;location=<!-- TMPL_VAR NAME="location" -->&amp;overduelevel=<!-- TMPL_VAR NAME="overdueLevel" -->
-                            &amp;notifyId=<!-- TMPL_VAR NAME="notify_id" -->">letter</a>
+                            &amp;notifyId=<!-- TMPL_VAR NAME="notify_id" -->">Notice</a>
                     <!-- /TMPL_IF -->
                     
                     <!-- TMPL_IF NAME="overdue2" -->
-                        <a href="branchoverdues.pl?action=add&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber"-->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->&amp;method=letter&amp;location=<!-- TMPL_VAR NAME="location" -->&amp;overduelevel=<!-- TMPL_VAR NAME="overdueLevel" -->&amp;notifyId=<!-- TMPL_VAR NAME="notify_id" -->">letter</a>
+                        <a href="branchoverdues.pl?action=add&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber"-->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->&amp;method=letter&amp;location=<!-- TMPL_VAR NAME="location" -->&amp;overduelevel=<!-- TMPL_VAR NAME="overdueLevel" -->&amp;notifyId=<!-- TMPL_VAR NAME="notify_id" -->">Notice</a>
                     <!-- /TMPL_IF -->
                     
                     <!-- TMPL_IF NAME="overdue3" -->
@@ -171,7 +171,7 @@
                         </td>
                     
                         <td>
-                        <a href="branchoverdues.pl?action=remove&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber"-->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->&amp;method=phone&amp;location=<!-- TMPL_VAR NAME="location" -->&amp;notify_date=<!-- TMPL_VAR NAME="notify_date" -->">cancel notification</a>
+                        <a href="branchoverdues.pl?action=remove&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber"-->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->&amp;method=phone&amp;location=<!-- TMPL_VAR NAME="location" -->&amp;notify_date=<!-- TMPL_VAR NAME="notify_date" -->">Cancel notification</a>
                         </td>
                     </tr>
                 <!-- /TMPL_LOOP -->
@@ -185,4 +185,4 @@
 <!-- TMPL_INCLUDE NAME="circ-menu.inc" -->
 </div>
 </div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbookfund.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbookfund.tmpl
index adce6d1731..f365066ae6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbookfund.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbookfund.tmpl
@@ -11,7 +11,7 @@
 
 <p>Funds may be ignored if you are setting your System Preferences to "simple" acquisitions: the funds are only useful when using "normal" acquisitions.</p>
 
-<p>"Funds" are accounts that you establish to keep track of your expenditures for library materials. They may be used for any kind of material, not just books, and should match the lines in your materials budget. For instance, if your library establishes a budget line for books, another for audiovisual materials, a third line for magazines, and a fourth budget line for electronic databases, then you would have four funds.</p>
+<p>"Funds" are accounts that you establish to keep track of your expenditures for library materials. They may be used for any kind of material and should match the lines in your materials budget. For instance, if your library establishes a budget line for books, another for audiovisual materials, a third line for magazines, and a fourth budget line for electronic databases, then you would have four funds.</p>
 
 <p>Each fund has a unique fund code, limited to no more than five characters, that identifies it. You should decide on your fund codes (e.g. something like BOOKS, AV, MAGS, DATA for the four funds described above) and enter the code in the "fund" box, then a full name in the "Name" box.</p>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/categorie.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/categorie.tmpl
index af9c62ee07..4d0a11e184 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/categorie.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/categorie.tmpl
@@ -4,16 +4,17 @@
 </head>
 <body>
 
-<h1>Borrower Categories</h1>
+<h1>Patron Categories</h1>
 
-<p>Here is where you define the types of users of your library and how they will be handled.</p>
+<p>This is where you define the types of users of your library and how they will be handled.</p>
 
-<h2>Category Code and Description</h2>
-<p>Start by assigning a Category Code and a Description to each patron type. The code is limited on no more than two characters and may be anything you choose. Four codes, however, have special meaning for Koha :</p>
+<h2>Category, Descriptions and Types</h2>
+<p>Start by assigning a Category Code and a Description to each patron category. Each Category can be one of four types:</p>
 <ul>
-	<li>"I" can be used for institutional members, like other libraries that borrow from you, in which case Koha expects slightly different information about the institution;</li>
-	<li>"A" (Adult) and "W" can be linked as "guarantors" to other patrons who are their dependents.</li>
-	<li>"C" (Children) is a patron category that has a "guarantor"</li>
+	<li>Adult Patrons can be linked as "guarantors" to other patrons who are their dependents.</li>
+	<li>Child Patrons a patron category that has a "guarantor"</li>
+	<li>Organisational Patrons can be used for institutional members, like other libraries that borrow from you, in which case Koha expects slightly different information about the institution;</li>
+	<li>Professional Patrons </li>
 </ul>
 
 <h2>Enrollment Period</h2>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/systempreferences.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/systempreferences.tmpl
index 130fe6f809..aca3cfd91a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/systempreferences.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/systempreferences.tmpl
@@ -24,23 +24,24 @@
 <li><b>insecure --</b> The best choice is "no." If you choose "yes," users do not have to login and all information is open to anyone. Be careful if you set this to "yes!"</li>
 
 <li>
-	<p><b>ISBD --</b> Koha can display records in International Standard Bibliographic Description format. the syntax of this field is quite complex : </p>
-	<p>it's divided into blocks, that can contain a text before, X fields, each having -or not- a string before, a string after, and a text after :</p>
-	<p><b>#995|&lt;br&gt;Items :|{\n995b}{ - 995j}{/995k}|</b></p>
+	<p><b>ISBD --</b> Koha can display records in International Standard Bibliographic Description format. The syntax of this format is quite complex.</p>
+	<p>It's divided into blocks, that can contain text before, X fields, each having -or not- a string before, a string after, and text after :</p>
+	<code>#995|&lt;br&gt;Items :|{\n995b}{ - 995j}{/995k}|</code>
 	<p>means the "block" 995 has &lt;br&gt;Items : BEFORE, then fields 995b, 995j and 995k, repeated for each item (995 is an UNIMARC standard), then nothing after the block.</p>
 	<p> The # means "beginning of a block", the | is the separator of each part, the {} being used for each subfield. A subfield can have up to 3 digits BEFORE and up to 3 digits AFTER each subfield</p>
-	<p>The UNIMARC (partial) definition for ISBD is </p><i>
-	<p>#700|&lt;label&gt;Titre/auteur&lt;/label&gt;|{700a}{701a}{702a}| ;
-		#200||{200a}{ [200b] }{. 200c}{ : 200e}{. 200h}{. 200i}{ / 200f}{ ; 200g}|<br />
-		#230||{ ; 230a}|<br />
-		#205||{ ; 205a}{ , 205b}{ = 205d}{ / 205f}{ ; 205g}|<br />
-		#210|&lt;br/&gt;&lt;label&gt;Editeur&lt;/label&gt;|{ ; 210a}{ (210b) }{ : 210c}{, 210d}|<br />
-		#210|(|{210e}{(210f)}{ : 210g}{, 210h}|)<br />
-		#215|&lt;br/&gt;&lt;label&gt;&nbsp;&lt;/label&gt;|{ ; 215a}{ : 215c}{ ; 215d}{ + 215e}|<br />
-		#225|&lt;br/&gt;&lt;label&gt;Description&lt;/label&gt;|{ (225a}{ = 225d}{ : 225e}{. 225h}{. 225i}{ / 225f}{, I225x}{ ; 225v}|)<br />
-		#606|&lt;br/&gt;&lt;label&gt;Sujets&lt;/label&gt;|{ 606a - }|&lt;br/&gt;&lt;br/&gt;<br />
-		#995|&lt;br&gt;Exemplaires :|{\n995b}{ - 995j}{/995k}|<br />
-	</i></p>
+	<p>The UNIMARC (partial) definition for ISBD is </p>
+	<code>
+		#700|&lt;label&gt;Titre/auteur&lt;/label&gt;|{700a}{701a}{702a}| ;
+		#200||{200a}{ [200b] }{. 200c}{ : 200e}{. 200h}{. 200i}{ / 200f}{ ; 200g}|
+		#230||{ ; 230a}|
+		#205||{ ; 205a}{ , 205b}{ = 205d}{ / 205f}{ ; 205g}|
+		#210|&lt;br/&gt;&lt;label&gt;Editeur&lt;/label&gt;|{ ; 210a}{ (210b) }{ : 210c}{, 210d}|
+		#210|(|{210e}{(210f)}{ : 210g}{, 210h}|)
+		#215|&lt;br/&gt;&lt;label&gt;&nbsp;&lt;/label&gt;|{ ; 215a}{ : 215c}{ ; 215d}{ + 215e}|
+		#225|&lt;br/&gt;&lt;label&gt;Description&lt;/label&gt;|{ (225a}{ = 225d}{ : 225e}{. 225h}{. 225i}{ / 225f}{, I225x}{ ; 225v}|)
+		#606|&lt;br/&gt;&lt;label&gt;Sujets&lt;/label&gt;|{ 606a - }|&lt;br/&gt;&lt;br/&gt;
+		#995|&lt;br&gt;Exemplaires :|{\n995b}{ - 995j}{/995k}|
+	</code>
 </li>
 
 <li><b>KohaAdminEmailAddress --</b> The email address that will receive requests from borrowers for modification of their records.</li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/bull/subscription-add.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/bull/subscription-add.tmpl
index ba454a8fbf..3efbcf631a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/bull/subscription-add.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/bull/subscription-add.tmpl
@@ -30,7 +30,7 @@
 		will result in the following issues numbers :
 		<p>#2004/1, #2004/2, #2004/3, #2004/4, #2005/1, #2005/2, #2005/3, #2005/4, #2006/1</p>
 		<p>
-			<b>Note:</b> when you add a subscription, Koha consider you already have done the order, or that you will do it soon. So, NO information is sent to the acquisition module. This is not the case when the subscription expires. In this case, a subscription renewal creates a "suggestion" that is sent to the acquisition module.
+			<b>Note:</b> when you add a subscription, Koha assumes you have already created the order, or that you will do it soon. So, NO information is sent to the acquisition module. This is not the case when the subscription expires. In this case, a subscription renewal creates a "suggestion" that is sent to the acquisition module.
 		</p>
 
 <!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tmpl
index 9f157cff1a..8898b5fda4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tmpl
@@ -123,13 +123,13 @@ table.print-preview {
         Barcodetype:<!-- TMPL_VAR NAME="barcodetype_opt" --><br />
         Papertype:<!-- TMPL_VAR NAME="papertype_opt" --><br />
         Field Options: <!-- TMPL_IF NAME="author_opt" -->Author <!-- /TMPL_IF -->
-        <!-- TMPL_IF NAME="itemtype_opt" -->itemtype <!-- /TMPL_IF -->
-        <!-- TMPL_IF NAME="title_opt" -->title <!-- /TMPL_IF -->
-        <!-- TMPL_IF NAME="isbn_opt" -->isbn <!-- /TMPL_IF -->
-        <!-- TMPL_IF NAME="dewey_opt" -->dewey <!-- /TMPL_IF -->
-        <!-- TMPL_IF NAME="class_opt" -->class<!-- /TMPL_IF -->
-	<!-- TMPL_IF NAME="subclass_opt" -->subclass<!-- /TMPL_IF -->
-	<!-- TMPL_IF NAME="itemcallnumber_opt" -->itemcallnumber<!-- /TMPL_IF -->
+        <!-- TMPL_IF NAME="itemtype_opt" -->Itemtype <!-- /TMPL_IF -->
+        <!-- TMPL_IF NAME="title_opt" -->Title <!-- /TMPL_IF -->
+        <!-- TMPL_IF NAME="isbn_opt" -->ISBN <!-- /TMPL_IF -->
+        <!-- TMPL_IF NAME="dewey_opt" -->Dewey <!-- /TMPL_IF -->
+        <!-- TMPL_IF NAME="class_opt" -->Class<!-- /TMPL_IF -->
+	<!-- TMPL_IF NAME="subclass_opt" -->Subclass<!-- /TMPL_IF -->
+	<!-- TMPL_IF NAME="itemcallnumber_opt" -->Itemcallnumber<!-- /TMPL_IF -->
 
 </h3>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tmpl
index 40e496b864..ef281a9c54 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tmpl
@@ -24,7 +24,7 @@
 <!-- TMPL_IF NAME="definitions" -->
 <h2>Current Terms</h2>
 <form action="/cgi-bin/koha/reports/dictionary.pl" method="post">
-Filter By Area <select name="areas">
+Filter by area <select name="areas">
 <option value="All">All</option>
 <!-- TMPL_LOOP NAME="areas" -->     
 <option value="<!-- TMPL_VAR NAME="id" -->"><!-- TMPL_VAR NAME="name"--></option>                  
@@ -192,12 +192,12 @@ Filter By Area <select name="areas">
 <!-- TMPL_IF NAME="date" -->
 <table>
 <tr valign="top">
-<td><input type="radio" name="<!-- TMPL_VAR NAME="name" -->_all" value="all" />All Dates</td>
+<td><input type="radio" name="<!-- TMPL_VAR NAME="name" -->_all" value="all" />All dates</td>
 <td>OR</td>
-<td><input type="radio" name="dates" value="range" />Date Range<br />
+<td><input type="radio" name="dates" value="range" />Date range<br />
 <table>
 <tr>
-<td>Start of Date Range</td>
+<td>Start of date range</td>
 <td><input type="text" size="10" id="<!-- TMPL_VAR NAME="name" -->_start_value" name="<!-- TMPL_VAR NAME="name" -->_start_value" value="" />      
 <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="buttonfrom1" style="cursor: pointer;"  />    
 <script type="text/javascript">                            
@@ -211,7 +211,7 @@ align          : "Tl"
 </td>
 </tr>
 <tr>
-<td>End of Date Range</td>
+<td>End of date range</td>
 <td>
 <input type="text" size="10" id="<!-- TMPL_VAR NAME="name" -->_end_value" name="<!-- TMPL_VAR NAME="name" -->_end_value" value="" />      
 <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="buttonfrom1" style="cursor: pointer;"  />    
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl
index 296d0a23fc..a13332bc80 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl
@@ -169,8 +169,7 @@ $(document).ready(function() {
         <table width="400px">
             <tr>
 <!--TMPL_UNLESS Name="onesubscription"-->
-                <th> # Subs.
-                </th>
+                <th># Subs</th>
 <!--/TMPL_UNLESS-->
                 <th>Date published
                 </th>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl
index bf2cd4d388..c9a53faa16 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl
@@ -320,12 +320,12 @@ function barcode_check(){
 		<input type="hidden" name="user" value="<!-- TMPL_VAR name="user" -->" />
 		<p><label>Librarian</label><!-- TMPL_VAR name="user" --></p>
 		<p><label>Starting date:</label><input type="text" name="histstartdate" value="<!-- TMPL_VAR name="histstartdate" -->" /> (the date of the 1st subscription)</p>
-		<p><label>Ending date:</label><input type="text" name="enddate" value="<!-- TMPL_VAR name="enddate" -->" />(if empty : subscription still active)</p>
+		<p><label>Ending date:</label><input type="text" name="enddate" value="<!-- TMPL_VAR name="enddate" -->" />(if empty subscription is still active)</p>
 		<p>Recieved issues</p>
 		<p><textarea name="recievedlist" cols="60" rows="5"><!-- TMPL_VAR name="recievedlist" --></textarea></p>
 		<p>Missing issues</p>
 		<p><textarea name="missinglist" cols="60" rows="2"><!-- TMPL_VAR name="missinglist" --></textarea></p>
-		<p>Opac's note</p>
+		<p>OPAC note</p>
 		<p><textarea name="opacnote" cols="60" rows="5"><!-- TMPL_VAR name="opacnote" --></textarea></p>
 		<input type="submit" value="Save changes" class="button" />
 	</form>
@@ -338,4 +338,4 @@ function barcode_check(){
 <!-- TMPL_INCLUDE NAME="serials-menu.inc" -->
 </div>
 </div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl
index 290df24926..8fe74128b3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl
@@ -523,7 +523,7 @@ function irregularity_check(){
             }
             error=errortext;
         } else {
-            errortext +=expected+_(" issues expected ")+rollover+_(" were entered. <br \/>Please indicate which date(s) an issue is not expected<br \/>");
+            errortext +=expected+_("issues expected")+rollover+_(" were entered. <br \/>Please indicate which date(s) an issue is not expected<br \/>");
             var count=0;
             for(var i=rollover;i<expected;i++){
                 errortext +="<select name='irregular' id='irregular"+count+"' onchange='display_example(expected)'>\n";
@@ -874,7 +874,7 @@ window.onload = irregular_order();
                     <option value="<!-- TMPL_VAR name="value" -->"><!-- TMPL_VAR name="lettername" --></option>
 <!-- /TMPL_IF -->
                 <!-- /TMPL_LOOP -->
-                </select> <div class="inputnote">(select a letter &amp; patrons will be able to "follow" this subscription and recieve a mail on every new issue)</div>
+                </select> <div class="inputnote">(select a notice and patrons on the routing list will receive notices for this subscription)</div>
             
         </li>
 	</ol>
@@ -1170,12 +1170,12 @@ window.onload = irregular_order();
     <h2>History</h2>
     <table>
         <tr>
-          <td>Starting date:</td>
+          <td>Starting date</td>
           <td><input type="text" name="histstartdate" value="<!-- TMPL_VAR name="histstartdate" -->" /> (the date of the 1st subscription)</td>
         </tr>
         <tr>
-          <td>Ending date:</td>
-          <td><input type="text" name="enddate" value="<!-- TMPL_VAR name="enddate" -->" />(if empty : subscription still active)</td>
+          <td>Ending date</td>
+          <td><input type="text" name="enddate" value="<!-- TMPL_VAR name="enddate" -->" />(if empty subscription is still active)</td>
         </tr>
         <tr>
             <td>Received issues</td>
@@ -1186,7 +1186,7 @@ window.onload = irregular_order();
             <td><textarea name="missinglist" cols="60" rows="5"><!-- TMPL_VAR name="missinglist" --></textarea></td>
         </tr>
         <tr>
-            <td>Opac's notes</td>
+            <td>OPAC notes</td>
             <td><textarea name="opacnote" cols="60" rows="5"><!-- TMPL_VAR name="opacnote" --></textarea></td>
         </tr>
         <tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tmpl
index 85c33d8478..c8f9361669 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tmpl
@@ -74,7 +74,7 @@
         <li>
         <label for="dont_export_fields">Don't export fields</label>
         <input id="dont_export_fields" type="text" name="dont_export_fields" />
-        <i>separate by a blank. (e.g.: 100a 200 606)</i>
+        separate by a blank. (e.g.: 100a 200 606)
         </li></ol>
     </fieldset>
     <fieldset class="rows">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl
index e4e4fe6324..e3f69c66fb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl
@@ -160,7 +160,7 @@
 		<input type="hidden" name="op" value="add_validate" />
 		<input type="hidden" name="checked" value="0" />
 		<fieldset class="rows">
-		<legend><!-- TMPL_IF name="modify" -->Modify letter<!-- TMPL_ELSE -->Add letter<!-- /TMPL_IF --></legend>
+		<legend><!-- TMPL_IF name="modify" -->Modify notice<!-- TMPL_ELSE -->Add notice<!-- /TMPL_IF --></legend>
 		<ol>
 		<!-- TMPL_IF NAME="modify" -->
 			<li>
diff --git a/misc/translator/rebuild_lang.sh b/misc/translator/rebuild_lang.sh
index d57bed8510..5821e980f0 100644
--- a/misc/translator/rebuild_lang.sh
+++ b/misc/translator/rebuild_lang.sh
@@ -1,9 +1,9 @@
 #!/bin/sh
-./tmpl_process3.pl install -r -s po/css_opac_fr_FR.po -i ../../koha-tmpl/opac-tmpl/css/en -o ../../koha-tmpl/opac-tmpl/css/fr
-./tmpl_process3.pl install -r -s po/default_intranet_fr_FR.po -i ../../koha-tmpl/intranet-tmpl/default/en -o ../../koha-tmpl/intranet-tmpl/default/fr
+#./tmpl_process3.pl install -r -s po/prog_opac_fr_FR.po -i ../../koha-tmpl/opac-tmpl/prog/en -o ../../koha-tmpl/opac-tmpl/prog/fr
+./tmpl_process3.pl install -r -s po/prog_intranet_fr_FR.po -i ../../koha-tmpl/intranet-tmpl/prog/en -o ../../koha-tmpl/intranet-tmpl/prog/fr
 
-./tmpl_process3.pl install -r -s po/css_opac_zh_TW.po -i ../../koha-tmpl/opac-tmpl/css/en -o ../../koha-tmpl/opac-tmpl/css/zh-TW
-./tmpl_process3.pl install -r -s po/default_intranet_zh_TW.po -i ../../koha-tmpl/intranet-tmpl/default/en -o ../../koha-tmpl/intranet-tmpl/default/zh-TW
+#./tmpl_process3.pl install -r -s po/prog_opac_zh_TW.po -i ../../koha-tmpl/opac-tmpl/prog/en -o ../../koha-tmpl/opac-tmpl/prog/zh-TW
+#./tmpl_process3.pl install -r -s po/default_intranet_zh_TW.po -i ../../koha-tmpl/intranet-tmpl/default/en -o ../../koha-tmpl/intranet-tmpl/default/zh-TW
 
 # ./tmpl_process3.pl install -r -s po/css_opac_es_AR.po -i ../../koha-tmpl/opac-tmpl/css/zh_TW -o ../../koha-tmpl/opac-tmpl/css/es_AR
-./tmpl_process3.pl install -r -s po/default_intranet_es_AR.po -i ../../koha-tmpl/intranet-tmpl/default/en -o ../../koha-tmpl/intranet-tmpl/default/es
+#./tmpl_process3.pl install -r -s po/default_intranet_es_AR.po -i ../../koha-tmpl/intranet-tmpl/default/en -o ../../koha-tmpl/intranet-tmpl/default/es
diff --git a/misc/translator/xgettext.pl b/misc/translator/xgettext.pl
index b793867f29..8d4d74c87e 100755
--- a/misc/translator/xgettext.pl
+++ b/misc/translator/xgettext.pl
@@ -258,7 +258,7 @@ sub convert_translation_file () {
     }
     # The following assumption is correct; that's what HTML::Template assumes
     if (!defined $charset_in) {
-	$charset_in = $charset_out = TmplTokenizer::charset_canon 'iso8859-1';
+	$charset_in = $charset_out = TmplTokenizer::charset_canon 'utf-8';
 	warn "Warning: Can't determine original templates' charset, defaulting to $charset_in\n";
     }
 }
-- 
2.39.2