nomenclature improvements for translation

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc
index 86a7f70..c9f2c2b 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc
@@ -1,5 +1,5 @@
 <ul>
        <li><a href="/cgi-bin/koha/acqui/lateorders.pl">Late orders</a></li>
        <li><a href="/cgi-bin/koha/suggestion/acceptorreject.pl?op=aorr_confirm">Manage suggestions</a></li>
-       <li><a href="/cgi-bin/koha/admin/aqbookfund.pl">Book Funds</a></li>
-</ul>
\ No newline at end of file
+       <li><a href="/cgi-bin/koha/admin/aqbookfund.pl">Funds</a></li>
+</ul>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/bookfund-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/bookfund-admin-search.inc
index c6ea1c6..08603f7 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/bookfund-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/bookfund-admin-search.inc
@@ -1,4 +1,4 @@
-<!-- Begin Bookfund Admin Resident Search Box -->
+<!-- Begin Fund Admin Resident Search Box -->
 <!-- TMPL_IF NAME="CircAutocompl" --><script type="text/javascript">
 //<![CDATA[
 YAHOO.util.Event.onContentReady("header_search", function() {
@@ -45,7 +45,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
  </script>  <!-- /TMPL_IF -->
 <div id="header_search">
        <div id="bookfund_search" class="residentsearch">
-       <p class="tip">Search Book Funds:</p>
+       <p class="tip">Search Funds:</p>
 
        <form action="/cgi-bin/koha/admin/aqbookfund.pl" method="post">
       <label for="filter_bookfundid">Code: </label><select name="filter_bookfundid" id="filter_bookfundid">
@@ -102,7 +102,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
                </form>
        </div>
                        <ul>
-                       <li><a href="/cgi-bin/koha/admin/aqbookfund.pl#bookfund_search">Search Book Funds</a></li>
+                       <li><a href="/cgi-bin/koha/admin/aqbookfund.pl#bookfund_search">Search Funds</a></li>
                        <li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check Out</a></li>
                        <li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the Catalog</a></li>
                        </ul>   

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc
index eb3da85..c6337a3 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc
@@ -44,7 +44,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 </script><!-- /TMPL_IF -->
 <div id="header_search">
        <div id="stopword_search" class="residentsearch">
-       <p class="tip">Stop Word Search:</p>
+       <p class="tip">Stop word search:</p>
            <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
         <input type="text" size="40" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
         <input type="submit" name="ok" value="Search" />

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl
index a70db16..8a9827d 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl
@@ -83,8 +83,8 @@
 
     <!-- TMPL_IF name="nobudget" -->
     <!-- TMPL_ELSE -->
-    <h2>Budgets and Funds</h2>
-    <a href="/cgi-bin/koha/admin/aqbookfund.pl" title="[ Manage Bookfunds ]">[ Manage ]</a>
+    <h2>Budgets and funds</h2>
+    <a href="/cgi-bin/koha/admin/aqbookfund.pl" title="[ Manage funds ]">[ Manage ]</a>
     <div id="BudgetsAndFunds">
     <table id="accounts">
         <thead>
@@ -138,4 +138,4 @@
 <!-- TMPL_INCLUDE NAME="acquisitions-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/acqui/basket.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl
index d56b424..bf0bad7 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl
@@ -31,11 +31,11 @@
 
     <!-- TMPL_IF NAME="basketno" --><div id="acqui_basket_summary">
         <h2>Basket Details</h2>
-        <p>Basket number  <!-- TMPL_VAR NAME="basketno" --></p>
-        <p>Managed by  <!-- TMPL_VAR NAME="authorisedbyname" --></p>
-        <p>Open on  <!-- TMPL_VAR NAME="creationdate" --></p>
-        <p>For  Supplier Id <!-- TMPL_VAR NAME="booksellerid" --></p>
-        <p>Invoice number <!-- TMPL_VAR NAME="booksellerinvoicenumber" --></p>
+        <p>Basket number:  <!-- TMPL_VAR NAME="basketno" --></p>
+        <p>Managed by:  <!-- TMPL_VAR NAME="authorisedbyname" --></p>
+        <p>Open on:  <!-- TMPL_VAR NAME="creationdate" --></p>
+        <p>For supplier ID: <!-- TMPL_VAR NAME="booksellerid" --></p>
+        <p>Invoice number: <!-- TMPL_VAR NAME="booksellerinvoicenumber" --></p>
         <!-- TMPL_IF name="closedate" --><p>Closed On:  <!-- TMPL_VAR name="closedate" --></p><!-- /TMPL_IF -->
         <!-- TMPL_UNLESS name="closedate" -->
         <p><a href="javascript:confirm_close()" class="button">Close this basket</a></p>
@@ -162,4 +162,4 @@
 <!-- TMPL_INCLUDE NAME="acquisitions-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/acqui/bookfund.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/bookfund.tmpl
index 17503e6..4e3e2a3 100755 (executable)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/bookfund.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/bookfund.tmpl
@@ -7,7 +7,7 @@
 <!-- TMPL_INCLUDE NAME="acquisitions-search.inc" -->   
                                                                            
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo;  Book Funds</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; Funds</div>
 
 <div id="doc3" class="yui-t2">                          
 <div id="bd">         

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl
index e5697de..d3ab7b4 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl
@@ -18,18 +18,18 @@
 
 
 <!-- TMPL_IF NAME="total" -->
-<b><!-- TMPL_VAR NAME="total" --> results found.</b>
+<b><!-- TMPL_VAR NAME="total" --> results found</b>
 <!-- TMPL_ELSE -->
-<h3> No Result found !</h3>
+<h3> No results found</h3>
 <p>
-    No results match your search for <span style="font-weight: bold;">&ldquo;<!-- TMPL_VAR NAME="query" -->&rdquo;</span> in <!-- TMPL_VAR NAME="LibraryName" --> Catalog.
+    No results match your search for <span style="font-weight: bold;">&ldquo;<!-- TMPL_VAR NAME="query" -->&rdquo;</span> in <!-- TMPL_VAR NAME="LibraryName" -->
 </p>
 <a href="JavaScript:back();" title="New search">Perform a new search</a>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="query_error" -->
 <br /><br />
-<b>Error :</b>
+<b>Error:</b>
 <span class="problem">
     <!-- TMPL_VAR NAME="query_error" -->
 </span>
@@ -71,4 +71,4 @@
 <!-- TMPL_INCLUDE NAME="acquisitions-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/acqui/neworderempty.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
index 0bf3291..3e71a5e 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
@@ -93,7 +93,7 @@ if (quantity ==0) {
   <ul>  <li>Basket number: <!-- TMPL_VAR NAME="basketno" --></li>
     <li>Managed by: <!-- TMPL_VAR NAME="authorisedbyname" --></li>
     <li>Open on: <!-- TMPL_VAR NAME="creationdate" --></li>
-    <li>For supplier id: <!-- TMPL_VAR NAME="booksellerid" --></li>
+    <li>For supplier ID: <!-- TMPL_VAR NAME="booksellerid" --></li>
     <li>Invoice number: <!-- TMPL_VAR NAME="booksellerinvoicenumber" --></li>
     <!-- TMPL_IF name="closedate" --><li>Closed on: <!-- TMPL_VAR name="closedate" --></li><!-- /TMPL_IF --></ul>
 </div>
@@ -204,10 +204,10 @@ if (quantity ==0) {
             </li>
             <li>
                 <!-- TMPL_IF name="close" -->
-                       <span class="label">Bookfund: </span>
+                       <span class="label">Fund: </span>
                     <input type="hidden" size="20" name="bookfund" id="bookfund" value="<!-- TMPL_VAR NAME="bookfundid" -->" /><!-- TMPL_VAR NAME="bookfundname" -->
                 <!-- TMPL_ELSE -->
-                <label for="bookfund">Bookfund: </label>
+                <label for="bookfund">Fund: </label>
                     <!-- TMPL_VAR NAME="CGIbookfund" -->
                 <!--/TMPL_IF-->
             </li>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tmpl
index f9413cd..81f8402 100755 (executable)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tmpl
@@ -13,7 +13,7 @@
 <div id="yui-main">                         
 <div class="yui-b">
 
-<h1>Budgets and Bookfunds</h1>
+<h1>Budgets and funds</h1>
 <h2>Spent</h2>
 
 <br /><br />

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl
index 607b921..d60d951 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl
@@ -71,8 +71,8 @@
 
 <h3>Additional parameters</h3>
 <dl>
-       <dt><a href="/cgi-bin/koha/admin/stopwords.pl">Stopwords</a></dt>
-       <dd>Words ignored during search</dd>
+       <dt><a href="/cgi-bin/koha/admin/stopwords.pl">Stop words</a></dt>
+       <dd>Words ignored during search.</dd>
        <dt><a href="/cgi-bin/koha/admin/printers.pl">Network Printers</a></dt>
        <dd>Printers (UNIX paths).</dd>
        <dt><a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 Client Targets</a></dt>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl
index f4def45..999857b 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl
@@ -209,7 +209,7 @@
 
 
 <!-- TMPL_IF name="add_validate" -->
-<h3>Bookfund Added</h3>
+<h3>Fund added</h3>
 
 <p>
   <a href="<!-- TMPL_VAR name="action" -->">Return to fund list</a>
@@ -218,7 +218,7 @@
 
 
 <!-- TMPL_IF name="mod_validate" -->
-<h3>Bookfund Modified</h3>
+<h3>Fund modified</h3>
 
 <p>
   <a href="<!-- TMPL_VAR name="action" -->">Return to fund list</a>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl
index 9c4b086..4a6c572 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Administration &rsaquo; <!-- TMPL_IF NAME="else" -->Budgets<!-- /TMPL_IF --><!-- TMPL_IF name="add_form" -->Budgets &rsaquo; <!-- TMPL_IF NAME="aqbudgetid" -->Modify<!-- TMPL_ELSE -->Add<!-- /TMPL_IF --> Budget<!-- /TMPL_IF --><!-- TMPL_IF NAME="add_validate" -->Budgets &rsaquo; Budget Data Recorded<!-- /TMPL_IF --><!-- TMPL_IF name="delete_confirmed" -->Budgets &rsaquo; Budget Deleted<!-- /TMPL_IF --><!-- TMPL_IF name="delete_confirm" -->Budgets &rsaquo; Delete Book Budget?<!-- /TMPL_IF --></title>
+<title>Koha &rsaquo; Administration &rsaquo; <!-- TMPL_IF NAME="else" -->Budgets<!-- /TMPL_IF --><!-- TMPL_IF name="add_form" -->Budgets &rsaquo; <!-- TMPL_IF NAME="aqbudgetid" -->Modify<!-- TMPL_ELSE -->Add<!-- /TMPL_IF --> Budget<!-- /TMPL_IF --><!-- TMPL_IF NAME="add_validate" -->Budgets &rsaquo; Budget Data Recorded<!-- /TMPL_IF --><!-- TMPL_IF name="delete_confirmed" -->Budgets &rsaquo; Budget Deleted<!-- /TMPL_IF --><!-- TMPL_IF name="delete_confirm" -->Budgets &rsaquo; Delete Budget?<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="calendar.inc" -->
 <!-- TMPL_IF name="add_form" -->
@@ -64,7 +64,7 @@
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="cat-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <!-- TMPL_IF NAME="else" -->Budgets<!-- /TMPL_IF --><!-- TMPL_IF name="add_form" --><a href="/cgi-bin/koha/admin/aqbudget.pl">Budgets</a> &rsaquo; <!-- TMPL_IF NAME="aqbudgetid" -->Modify<!-- TMPL_ELSE -->Add<!-- /TMPL_IF --> Budget<!-- /TMPL_IF --><!-- TMPL_IF NAME="add_validate" --><a href="/cgi-bin/koha/admin/aqbudget.pl">Budgets</a> &rsaquo; Budget Data Recorded<!-- /TMPL_IF --><!-- TMPL_IF name="delete_confirmed" --><a href="/cgi-bin/koha/admin/aqbudget.pl">Budgets</a> &rsaquo; Budget Deleted<!-- /TMPL_IF --><!-- TMPL_IF name="delete_confirm" --><a href="/cgi-bin/koha/admin/aqbudget.pl">Budgets</a> &rsaquo; Delete Book Budget?<!-- /TMPL_IF --></div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <!-- TMPL_IF NAME="else" -->Budgets<!-- /TMPL_IF --><!-- TMPL_IF name="add_form" --><a href="/cgi-bin/koha/admin/aqbudget.pl">Budgets</a> &rsaquo; <!-- TMPL_IF NAME="aqbudgetid" -->Modify<!-- TMPL_ELSE -->Add<!-- /TMPL_IF --> Budget<!-- /TMPL_IF --><!-- TMPL_IF NAME="add_validate" --><a href="/cgi-bin/koha/admin/aqbudget.pl">Budgets</a> &rsaquo; Budget Data Recorded<!-- /TMPL_IF --><!-- TMPL_IF name="delete_confirmed" --><a href="/cgi-bin/koha/admin/aqbudget.pl">Budgets</a> &rsaquo; Budget Deleted<!-- /TMPL_IF --><!-- TMPL_IF name="delete_confirm" --><a href="/cgi-bin/koha/admin/aqbudget.pl">Budgets</a> &rsaquo; Delete Budget?<!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
    
@@ -86,7 +86,7 @@
 <h1>Budgets</h1>
 <form action="/cgi-bin/koha/admin/aqbudget.pl" method="post">
 <fieldset class="rows"><legend>Search Budgets</legend><ol>
-    <li><label for="filter_bookfundid"> Book fund:</label>
+    <li><label for="filter_bookfundid"> Fund:</label>
       <select name="filter_bookfundid" id="filter_bookfundid">
         <option value="">----</option>
     <!-- TMPL_LOOP name="filter_bookfundids" -->
@@ -206,7 +206,7 @@
 
 <table>
   <tr>
-    <th>Book fund</th>
+    <th>Fund</th>
     <th>Branch</th>
     <th>Start date</th>
     <th>End date</th>
@@ -246,7 +246,7 @@
 
     
      <ol> <li>
-        <span class="label">Book fund: </span>
+        <span class="label">Fund: </span>
         <input type="hidden" name="bookfundid" value="<!-- TMPL_VAR NAME="bookfundid" -->" />
           <!-- TMPL_VAR NAME="bookfundname" -->
       </li>
@@ -328,7 +328,7 @@
 
 <!-- TMPL_IF name="delete_confirm" -->
   <fieldset>
-    <legend>Delete Book Budget?</legend>
+    <legend>Delete Budget?</legend>
 
     <table>
       <tr>

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 3ef171c..f79de8d 100644 (file)
--- 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
@@ -30,7 +30,7 @@
             <li><label for="mandatory<!-- TMPL_VAR NAME="row" -->">Mandatory: </label><!-- TMPL_VAR NAME="mandatory" -->&nbsp;</li>
             <li><label for="liblibrarian<!-- TMPL_VAR NAME="row" -->">Text for librarian: </label><input id="liblibrarian<!-- TMPL_VAR NAME="row" -->" type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" -->" size="40" maxlength="80" /></li>
             <li><label for="libopac<!-- TMPL_VAR NAME="row" -->">Text for OPAC: </label><input type="text" id="libopac<!-- TMPL_VAR NAME="row" -->" name="libopac" value="<!-- TMPL_VAR NAME="libopac" -->" size="40" maxlength="80" /></li>
-            <li><label for="tab<!-- TMPL_VAR NAME="row" -->">Managed in tab: </label><!-- TMPL_VAR NAME="tab" --> (ignore means that the subfield is NOT managed by Koha)</li>
+            <li><label for="tab<!-- TMPL_VAR NAME="row" -->">Managed in tab: </label><!-- TMPL_VAR NAME="tab" --> (ignore means that the subfield does not display in the record editor)</li>
             <li><fieldset><legend>Display</legend>
 <ol>
        <li><label for="ohidden<!-- TMPL_VAR NAME="row" -->">Opac:</label><!-- TMPL_VAR name="ohidden" -->  </li>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl
index 1944179..f8ee05b 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl
@@ -1,9 +1,9 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Administration &rsaquo; Item Types <!-- TMPL_IF name="add_form" -->&rsaquo; 
   <!-- TMPL_IF name="itemtype" -->
-Modify item type '<!-- TMPL_VAR name="itemtype" -->'
+Modify Item Type '<!-- TMPL_VAR name="itemtype" -->'
   <!-- TMPL_ELSE -->
-Add item type
+Add Item Type
   <!-- /TMPL_IF -->
 <!-- /TMPL_IF -->
 <!-- TMPL_IF name="delete_confirm" -->&rsaquo; 
@@ -82,9 +82,9 @@ function Check(f) {
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <!-- TMPL_IF name="add_form" -->
   <!-- TMPL_IF name="itemtype" -->
-<a href="/cgi-bin/koha/admin/itemtypes.pl">Item Types</a> &rsaquo; Modify item type '<!-- TMPL_VAR name="itemtype" -->'
+<a href="/cgi-bin/koha/admin/itemtypes.pl">Item Types</a> &rsaquo; Modify Item Type '<!-- TMPL_VAR name="itemtype" -->'
   <!-- TMPL_ELSE -->
-<a href="/cgi-bin/koha/admin/itemtypes.pl">Item Types</a> &rsaquo; Add item type
+<a href="/cgi-bin/koha/admin/itemtypes.pl">Item Types</a> &rsaquo; Add Item Type
   <!-- /TMPL_IF -->
 <!-- /TMPL_IF -->
 <!-- TMPL_IF name="delete_confirm" -->
@@ -131,9 +131,9 @@ Item Types Administration
 
 <!-- TMPL_IF name="add_form" -->
   <!-- TMPL_IF name="itemtype" -->
-      <h3>Modify item type</h3>
+      <h3>Modify Item Type</h3>
   <!-- TMPL_ELSE -->
-      <h3>Add item type</h3>
+      <h3>Add Item Type</h3>
   <!-- /TMPL_IF -->
 <form action="<!-- TMPL_VAR name="script_name" -->" name="Aform" method="post">
   <input type="hidden" name="op" value="add_validate" />
@@ -256,7 +256,7 @@ Item Types Administration
     <th>Image</th>
     <th>Code</th>
     <th>Description</th>
-    <th>Not for Loan</th>
+    <th>Not for loan</th>
     <th>Renewable</th>
     <th>Charge</th>
     <th>Actions</th>
@@ -277,7 +277,7 @@ Item Types Administration
     <td><!-- TMPL_IF NAME="notforloan" -->Yes<!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td>
     <td>
     <!-- TMPL_IF NAME="renewalsallowed" -->
-      <!-- TMPL_VAR name="renewalsallowed" --> time(s)
+      <!-- TMPL_VAR name="renewalsallowed" --> times
     <!-- TMPL_ELSE -->
       No
     <!-- /TMPL_IF -->

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 68d9d34..17a217b 100644 (file)
--- 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
@@ -79,7 +79,7 @@ function displayMoreConstraint(numlayer){
                                <li><label for="libopac<!-- TMPL_VAR NAME="row" -->">Text for OPAC: </label><input type="text" id="libopac<!-- TMPL_VAR NAME="row" -->" name="libopac" value="<!-- TMPL_VAR NAME="libopac" -->" size="40" maxlength="80" /></li>
                                <li><label for="repeatable<!-- TMPL_VAR NAME="row" -->">Repeatable: </label><!-- TMPL_VAR NAME="repeatable" --></li>
                                <li><label for="mandatory<!-- TMPL_VAR NAME="row" -->">Mandatory: </label><!-- TMPL_VAR NAME="mandatory" --></li>
-                               <li><label for="tab<!-- TMPL_VAR NAME="row" -->">Managed in tab: </label><!-- TMPL_VAR NAME="tab" --> (ignore means that the subfield is NOT managed by Koha)</li>
+                               <li><label for="tab<!-- TMPL_VAR NAME="row" -->">Managed in tab: </label><!-- TMPL_VAR NAME="tab" --> (ignore means that the subfield does not display in the record editor)</li>
                        </ol>
             </fieldset>
                        
@@ -90,8 +90,8 @@ function displayMoreConstraint(numlayer){
                 <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 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><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" /> (e.g., 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>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/stopwords.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/stopwords.tmpl
index 7e882e6..5550ffd 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/stopwords.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/stopwords.tmpl
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; System Administration &rsaquo; <!-- TMPL_IF NAME="else" -->Stop Words<!-- /TMPL_IF --><!-- TMPL_IF NAME="add_form" --> Stop Words &rsaquo; <!-- TMPL_IF NAME="searchfield" -->Modify Stop Word<!-- TMPL_ELSE -->New Stop Word<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF NAME="add_validate" --> Stop Words &rsaquo; Data recorded<!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirm" --> Stop Words &rsaquo; Delete Stop Word '<!-- TMPL_VAR NAME="searchfield" -->' ?<!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirmed" --> Stop Words &rsaquo; Data deleted<!-- /TMPL_IF --></title>
+<title>Koha &rsaquo; System Administration &rsaquo; <!-- TMPL_IF NAME="else" -->Stop words<!-- /TMPL_IF --><!-- TMPL_IF NAME="add_form" --> Stop words &rsaquo; <!-- TMPL_IF NAME="searchfield" -->Modify stop word<!-- TMPL_ELSE -->New stop word<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF NAME="add_validate" --> Stop words &rsaquo; Data recorded<!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirm" --> Stop words &rsaquo; Delete stop word '<!-- TMPL_VAR NAME="searchfield" -->' ?<!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirmed" --> Stop words &rsaquo; Data deleted<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_IF NAME="add_form" -->
         <script language="javascript" type="text/javascript">

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl
index 1435013..61414e6 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl
@@ -45,7 +45,7 @@
                 var ok=1;
                 var _alertString="";
                 var alertString2;
-                if (f.searchfield.value.length==0) {_alertString += "- site name missing\n";
+                if (f.searchfield.value.length==0) {_alertString += "- target name missing\n";
                 }
                 if (f.host.value.length==0) {_alertString += "- host missing\n";
                 }
@@ -130,7 +130,7 @@
        <!-- TMPL_VAR NAME="reqsel" -->
 <h3>Confirm Deletion of Server <!-- TMPL_VAR NAME="searchfield" --></h3>       
         <ul>
-                <li><strong>Site: </strong>        <!-- TMPL_VAR NAME="searchfield" --></li>
+                <li><strong>Target: </strong>        <!-- TMPL_VAR NAME="searchfield" --></li>
                 <li><strong>Hostname: </strong><!-- TMPL_VAR NAME="host" --></li>
                 <li><strong>Port: </strong><!-- TMPL_VAR NAME="port" --></li>
                 <li><strong>Database: </strong><!-- TMPL_VAR NAME="db" --></li>
@@ -175,7 +175,7 @@
                 You searched for <!-- TMPL_VAR NAME="searchfield" -->
         <!-- /TMPL_IF -->              
 <table>
-                <tr><th>Site</th><th>Hostname/Port</th><th>Database</th><th>Userid</th><th>Password</th><th>Checked</th><th>Rank</th>                          <th>Syntax</th><th colspan="2">&nbsp;</th>
+                <tr><th>Target:</th><th>Hostname/Port:</th><th>Database:</th><th>Userid:</th><th>Password:</th><th>Checked:</th><th>Rank:</th>                         <th>Syntax:</th><th colspan="2">&nbsp;</th>
                 </tr>
                 <!-- TMPL_LOOP NAME="loop" -->
                <!-- TMPL_IF NAME="toggle" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF --><td><!-- TMPL_VAR NAME="name" --></td><td><!-- TMPL_VAR NAME="host" -->:<!-- TMPL_VAR NAME="port" --></td><td><!-- TMPL_VAR NAME="db" --></td><td><!-- TMPL_VAR NAME="userid" --></td><td><!-- TMPL_VAR NAME="password" --></td><td><!-- TMPL_VAR NAME="checked" --></td><td><!-- TMPL_VAR NAME="rank" --></td>                      <td><!-- TMPL_VAR NAME="syntax" --></td><td><a href="<!-- TMPL_VAR name="script_name" -->?op=add_form&amp;searchfield=<!-- TMPL_VAR NAME="name" -->">Edit</a></td><td><a href="<!-- TMPL_VAR name="script_name" -->?op=delete_confirm&amp;searchfield=<!-- TMPL_VAR NAME="name" -->">Delete</a></td>                </tr>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tmpl
index 348062e..c314a04 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tmpl
@@ -16,19 +16,19 @@
 <div id="login">
 <h1><a href="http://koha.org">Koha</a></h1>
 <!-- TMPL_IF NAME="nopermission" -->
-<div id="login_error"><strong>Error</strong>: unauthorized user <a href="/cgi-bin/koha/mainpage.pl?logout.x=1">click to log out</a></div>
+<div id="login_error"><strong>Error: </strong>Unauthorized user<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">click to log out</a></div>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="timed_out" -->
-<div id="login_error"><strong>Error</strong>: session timed out, please log in again</div>
+<div id="login_error"><strong>Error: </strong>Session timed out, please log in again</div>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="different_ip" -->
-<div id="login_error"><strong>Error</strong>: IP address has changed, please log in again </div>
+<div id="login_error"><strong>Error: </strong>IP address has changed, please log in again </div>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="invalid_username_or_password" -->
-<div id="login_error"><strong>Error</strong>: Incorrect username or password</div>
+<div id="login_error"><strong>Error: </strong>Invalid username or password</div>
 <!-- /TMPL_IF -->
 
 <!-- login prompt time-->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl
index c639cf6..ef3b929 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl
@@ -93,7 +93,7 @@ function jumpfull(page)
                 <!-- TMPL_IF name="total" -->
                     &nbsp;<b>Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="total" --></b><br /><br />
                 <!-- TMPL_ELSE -->
-                    &nbsp;No results found.<br />
+                    &nbsp; No results found<br />
                 <!-- /TMPL_IF -->
             </p>
         </div>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl
index 40da2e1..fa49b98 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl
@@ -83,7 +83,7 @@ function searchauthority() {
 <div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div>
 
 <!-- TMPL_ELSE -->
-  No results found.
+  No results found
   
   <fieldset id="authorities_authorities_home_search">
   <legend>Authority search</legend>

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 509a5fe..9659c5c 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl
@@ -74,7 +74,7 @@
                 <option value="pn,wrdl" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>&nbsp;&nbsp;&nbsp;&nbsp; Personal Name</option>
                 <option value="pn,phr" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>&nbsp;&nbsp;&nbsp;&nbsp; Personal Name Phrase</option>
                 <option value="ln" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Language</option>
-                <option value="nt,wrdl" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Notes/Comments</option>
+                <option value="nt,wrdl" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Notes</option>
                 <option value="pb,wrdl" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Publisher</option>
                 <option value="pl,wrdl" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Publisher Location</option>
                 <option value="yr" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Publication Date</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 a15030b..ff49030 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
@@ -70,7 +70,7 @@
                
 <div class="yui-u">
                <!-- TMPL_IF NAME="AmazonContent" -->
-               <a href="http://www.amazon.com/gp/reader/<!-- TMPL_VAR NAME="amazonisbn" -->/ref=sib_dp_pt/002-7879865-0184864#reader-link"><img border="0" src="http://images.amazon.com/images/P/<!-- TMPL_VAR NAME="amazonisbn" -->.01._PIdp-schmooS,TopRight,7,-26_SCMZZZZZZZ_.jpg" alt="Book Cover Image" /></a>
+               <a href="http://www.amazon.com/gp/reader/<!-- TMPL_VAR NAME="amazonisbn" -->/ref=sib_dp_pt/002-7879865-0184864#reader-link"><img border="0" src="http://images.amazon.com/images/P/<!-- TMPL_VAR NAME="amazonisbn" -->.01._PIdp-schmooS,TopRight,7,-26_SCMZZZZZZZ_.jpg" alt="Cover image" /></a>
                <!-- TMPL_ELSE -->
                <img src="http://g-images.amazon.com/images/G/01/x-site/icons/no-img-sm.gif" alt="" border="0"/>
                <!-- /TMPL_IF --></div>         

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/dictionary.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/dictionary.tmpl
index 061381e..5e1f66e 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/dictionary.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/dictionary.tmpl
@@ -40,7 +40,7 @@
                        
                        
                        <!-- TMPL_IF NAME="nbresults" -->
-                                       Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="nbresults" --> in Authorities<!-- TMPL_ELSE -->No results found.
+                                       Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="nbresults" --> in Authorities<!-- TMPL_ELSE -->No results found
                        <!-- /TMPL_IF -->
                        
                
@@ -77,7 +77,7 @@
        <h2>Catalog Results</h2>
                        
                        <!-- TMPL_IF NAME="total" -->
-                                       Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="total" --> in the Catalog<!-- TMPL_ELSE -->No results found.
+                                       Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="total" --> in the Catalog<!-- TMPL_ELSE -->No results found
                        <!-- /TMPL_IF -->
                
                        <table>
@@ -122,7 +122,7 @@
 
                        
                        <!-- TMPL_IF NAME="total" -->
-                                       Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="total" --> in the Catalog<!-- TMPL_ELSE -->No results found.
+                                       Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="total" --> in the Catalog<!-- TMPL_ELSE -->No results found
                        <!-- /TMPL_IF -->
                        
                

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
index 6e67b5c..ee8a108 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
@@ -45,7 +45,7 @@
     
     <!-- TMPL_IF NAME="query_error" -->
         <br /><br />
-        Error : 
+        Error: 
         <span  class="problem">
             <!-- TMPL_VAR NAME="query_error" -->
         </span>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl
index f151269..a656392 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl
@@ -21,13 +21,13 @@
 <!-- TMPL_INCLUDE NAME="cataloging-toolbar.inc" -->
        
        <!-- TMPL_IF name="noitemsfound" -->
-               No items found
+               No results found
        <!-- /TMPL_IF -->
 
 <!-- display the search results -->
 
 <!-- TMPL_IF NAME="total"-->
-<!-- TMPL_VAR NAME="total"--> Results found in catalogue.
+<!-- TMPL_VAR NAME="total"--> results found
 <!-- TMPL_VAR name='pagination_bar'-->
 <div class="searchresults">
     <table>
@@ -98,7 +98,7 @@
 </div>
 <!-- TMPL_ELSE -->
     <!-- TMPL_IF name='query'-->
-        <b>No Result found in catalogue.</b>
+        <b>No results found</b>
         <!-- TMPL_IF NAME="error" -->
             Error: <span class="error"><!-- TMPL_VAR NAME="error" --></span>
         <!-- /TMPL_IF -->
@@ -138,4 +138,4 @@
 <!-- /TMPL_IF -->
 </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/cataloguing/value_builder/labs_theses.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/labs_theses.tmpl
index d86a150..ef17e48 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/labs_theses.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/labs_theses.tmpl
@@ -61,7 +61,7 @@ a.catalogue:hover {
                <div id="resultnumber">
                        <p class="resultcount">
                        <!-- TMPL_IF NAME="total" -->
-                                       Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="total" --><!-- TMPL_ELSE -->No results found.
+                                       Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="total" --><!-- TMPL_ELSE -->No results found
                        <!-- /TMPL_IF -->
                        </p>
                </div>
@@ -105,7 +105,7 @@ a.catalogue:hover {
                        </p>
                        <p class="resultcount">
                        <!-- TMPL_IF NAME="total" -->
-                                       Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="total" --><!-- TMPL_ELSE -->No results found.
+                                       Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="total" --><!-- TMPL_ELSE -->No results found
                        <!-- /TMPL_IF -->
                        </p>
                </div>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tmpl
index 975d346..4948ca3 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tmpl
@@ -37,7 +37,7 @@
                 <!-- TMPL_IF name="total" -->
                     &nbsp;<b>Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="total" --></b><br><br>
                 <!-- TMPL_ELSE -->
-                    &nbsp;No results found.<br>
+                    &nbsp; No results found<br>
                 <!-- /TMPL_IF -->
             </p>
         </div>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tmpl
index 4c31e58..88623fa 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tmpl
@@ -129,7 +129,7 @@
                <div id="unimarc_field_4XX_resultnumber">
                        <p><!-- TMPL_IF NAME="displayprev" --> <a class="resultnumber" href="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_4XX.pl&amp;index=<!--TMPL_VAR Name="index"-->&amp;startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;search=<!-- TMPL_VAR NAME="search" -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">&lt;&lt; Previous</a><!-- /TMPL_IF -->
                                <!-- TMPL_LOOP NAME="numbers" --><!-- TMPL_IF NAME="highlight" --> <span class="highlight"><!-- TMPL_VAR NAME="number" --></span><!-- TMPL_ELSE --> <a class="resultnumber" href="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_4XX.pl&amp;index=<!--TMPL_VAR Name="index"-->&amp;startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><!-- TMPL_VAR NAME="number" --></a><!-- /TMPL_IF --><!-- /TMPL_LOOP --> <!-- TMPL_IF NAME="displaynext" --><a class="resultnumber" href="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_4XX.pl&amp;index=<!--TMPL_VAR Name="index"-->&amp;startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;search=<!-- TMPL_VAR NAME="search" -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">Next&gt;&gt;</a><!-- /TMPL_IF --></p>
-                       <p class="resultcount"><!-- TMPL_IF NAME="total" -->Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="total" --><!-- TMPL_ELSE -->No results found.<!-- /TMPL_IF --></p></div>
+                       <p class="resultcount"><!-- TMPL_IF NAME="total" -->Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="total" --><!-- TMPL_ELSE -->No results found<!-- /TMPL_IF --></p></div>
                <div id="resultlist">
                        <table>
                                <tr>

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 062e448..a0d5ab5 100755 (executable)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl
@@ -50,7 +50,7 @@
             <th>Patron</th>
             <th>Library</th>
             <th>Overdue status</th>
-            <th>Notify by</th>
+            <th>Notified by</th>
         </tr>
             <!-- TMPL_LOOP NAME="overduesloop" -->
                 <tr>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
index 2b49d85..73c06fe 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
@@ -264,7 +264,7 @@
             <!-- TMPL_IF Name="duedate" -->
                 <!-- TMPL_IF Name="early" --><!-- /TMPL_IF --><!-- TMPL_VAR Name="year" -->/<!-- TMPL_VAR Name="month" -->/<!-- TMPL_VAR Name="day" --><!-- TMPL_IF Name="early" --></span><!-- /TMPL_IF -->
             <!-- TMPL_ELSE -->
-                Not on Issue.
+                Not on issue
             <!-- /TMPL_IF -->
             </td>
             <td>
@@ -276,7 +276,7 @@
                     <!-- TMPL_VAR Name="borsurname" -->, <!-- TMPL_VAR Name="borfirstname" -->
                 </a>
             <!-- TMPL_ELSE -->
-                                Not on issue.
+                                Not on issue
             <!-- /TMPL_IF -->
             </td></tr>
         <!-- /TMPL_LOOP -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tmpl
index 657ad33..45ca587 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tmpl
@@ -1,27 +1,29 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title><!-- TMPL_IF NAME="nopermission" -->Koha &rsaquo; Error: Access Denied<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="timed_out" -->Koha &rsaquo; Error: Session Timed Out --<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="different_ip" -->Koha &rsaquo; Error: IP Address Change -- <!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="invalid_username_or_password" -->Koha &rsaquo; Error Invalid Username or Password -- <!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="loginprompt" -->Koha &rsaquo; Welcome to the Koha Web Installer<!-- /TMPL_IF --></title>
+<title>Koha &rsaquo; 
+    <!-- TMPL_IF NAME="nopermission" -->Access denied<!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="timed_out" -->Session timed out<!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="different_ip" -->IP address change<!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="invalid_username_or_password" -->Invalid username or password<!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="loginprompt" -->Log in to Koha<!-- /TMPL_IF -->
+</title>
 
 <!-- TMPL_INCLUDE NAME="installer-doc-head-close.inc" -->
 <div id="login">
 <h1><a>Koha 3.0 Installer</a></h1>
 <!-- TMPL_IF NAME="nopermission" -->
-<div id="login_error"><strong>Error</strong>: unauthorized user <a href="/cgi-bin/koha/mainpage.pl?logout.x=1">click to log out</a></div>
+<div id="login_error"><strong>Error: </strong>Unauthorized user <a href="/cgi-bin/koha/mainpage.pl?logout.x=1">click to log out</a></div>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="timed_out" -->
-<div id="login_error"><strong>Error</strong>: session timed out, please log in again</div>
+<div id="login_error"><strong>Error: </strong>Session timed out, please log in again</div>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="different_ip" -->
-<div id="login_error"><strong>Error</strong>: IP address has changed, please log in again </div>
+<div id="login_error"><strong>Error: </strong>IP address has changed, please log in again </div>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="invalid_username_or_password" -->
-<div id="login_error"><strong>Error</strong>: Incorrect username or password</div>
+<div id="login_error"><strong>Error: </strong>Invalid username or password</div>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="loginprompt" -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tmpl
index ad4416b..0b48655 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tmpl
@@ -66,7 +66,7 @@ function add_item3(itemnumber){
                        <!-- TMPL_IF name=total -->
                        &nbsp;<b>Results <!-- TMPL_VAR name="from" --> to <!-- TMPL_VAR name="to" --> of <!-- TMPL_VAR name="total" --></b><br><br>
                        <!-- TMPL_ELSE -->
-                       &nbsp; No results found.<br>
+                       &nbsp; No results found<br>
                        <!-- /TMPL_IF -->
                </p>
        </div>
@@ -137,4 +137,4 @@ function add_item3(itemnumber){
        </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/members/boraccount.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl
index 6734feb..32fb470 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl
@@ -20,17 +20,17 @@
 <ul class="tabs-nav">
        <li class="tabs-selected"><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Account</a></li>
        <li><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->" >Pay fines</a></li>
-       <li><a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->" >Create Manual Invoice</a></li>
-       <li><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->" >Create Manual Credit</a></li>
+       <li><a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->" >Create manual invoice</a></li>
+       <li><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->" >Create manual credit</a></li>
 </ul>
 <div class="tabs-container">
 <!-- The table with the account items -->
 <table>
   <tr>
        <th>Date</th>
-    <th>Description of Charges</th>
+    <th>Description of charges</th>
     <th>Amount</th>
-    <th>Still Owed</th>
+    <th>Outstanding</th>
   </tr>
 
   <!-- TMPL_LOOP NAME="accounts" -->
@@ -45,7 +45,7 @@
   <!-- /TMPL_LOOP -->
 <tfoot>
   <tr>
-    <td colspan="3">Total Due</td>
+    <td colspan="3">Total due</td>
     <!-- TMPL_IF NAME="totalcredit" --><td class="credit"><!-- TMPL_ELSE --><td class="debit"><!-- /TMPL_IF -->$<!-- TMPL_VAR NAME="total" --></td>
   </tr>
   </tfoot>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl
index 6ae5c49..426fe20 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl
@@ -50,7 +50,7 @@
 
 <!-- TMPL_IF NAME="resultsloop" -->
     <h3>Results for Search: <span class="ex"><!-- TMPL_VAR NAME="member" --></span></h3>
-       <div class="results"><!-- TMPL_VAR Name ="numresults" --> patrons found.</div>
+       <div class="results"><!-- TMPL_VAR Name ="numresults" --> patrons found</div>
 <div class="searchresults">
     <table>
     <tr>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
index 61280bc..ce93739 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
@@ -48,7 +48,7 @@
 <div id="patron-information" style="padding : .5em;">
 <h3>
     <!-- TMPL_UNLESS NAME="I" -->
-   <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- /TMPL_UNLESS --> <!-- TMPL_VAR NAME="surname" --></h3> <!-- TMPL_UNLESS NAME="I" --><!-- TMPL_IF NAME="othernames" -->"<!-- TMPL_VAR NAME="othernames" -->"<!-- /TMPL_IF -->  <p><!-- TMPL_VAR NAME="streetnumber" -->
+   <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- /TMPL_UNLESS --> <!-- TMPL_VAR NAME="surname" --></h3> <!-- TMPL_UNLESS NAME="I" --><!-- TMPL_IF NAME="othernames" --> <!-- TMPL_VAR NAME="othernames" --> <!-- /TMPL_IF -->  <p><!-- TMPL_VAR NAME="streetnumber" -->
         <!--TMPL_IF NAME="roaddetails"-->
          <!-- TMPL_VAR NAME="roaddetails" -->,
         <!-- /TMPL_IF -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/inventory.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/inventory.tmpl
index 45f6383..8b7ae1c 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/inventory.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/inventory.tmpl
@@ -83,7 +83,7 @@
                <input type="hidden" name="datelastseen" value="<!-- TMPL_VAR NAME="datelastseen" -->" />
                <input type="hidden" name="pagesize" value="<!-- TMPL_VAR NAME="pagesize" -->" />
                <input type="hidden" name="offset" value="<!-- TMPL_VAR NAME="prevoffset" -->" />
-               <input type="submit" value="&lt;&lt;&lt;" />
+               <input type="submit" value="&lt;&lt;" />
        </form>
        <!-- /TMPL_IF -->
        
@@ -94,7 +94,7 @@
                <input type="hidden" name="datelastseen" value="<!-- TMPL_VAR NAME="datelastseen" -->" />
                <input type="hidden" name="pagesize" value="<!-- TMPL_VAR NAME="pagesize" -->" />
                <input type="hidden" name="offset" value="<!-- TMPL_VAR NAME="nextoffset" -->" />
-               <input type="submit" value="&gt;&gt;&gt;" />
+               <input type="submit" value="&gt;&gt;" />
        </form>
        <!-- /TMPL_IF -->
 
@@ -104,4 +104,4 @@
 <!-- TMPL_INCLUDE NAME="reports-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/reports/itemslost.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tmpl
index 5dafcb7..ff44959 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tmpl
@@ -18,9 +18,9 @@
 
 <div class="results">
     <!-- TMPL_IF NAME="total" -->
-        <!-- TMPL_VAR NAME="total" --> lost item(s) found.
+        <!-- TMPL_VAR NAME="total" --> lost items found
     <!-- TMPL_ELSE-->
-        No lost items found.
+        No lost items found
     <!-- /TMPL_IF -->
 </div>
 

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tmpl
index 10cf018..413bb15 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tmpl
@@ -23,7 +23,7 @@ function GetIt(aqbooksellerid,name)
 <!-- TMPL_IF NAME="loop_suppliers" -->
 <table>
        <tr>
-               <th>Book seller</th>
+               <th>Supplier</th>
                <th>Select</th>
        </tr>
        <!-- TMPL_LOOP name="loop_suppliers" -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tmpl
index 1585cc0..38e3cb3 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tmpl
@@ -21,7 +21,7 @@ function GetIt(bibno,title)
    <div id="bd">
        
 
-<h1>Biblio Search results</h1>
+<h1>Search results</h1>
 <!-- TMPL_IF NAME="total"-->
 <table>
     <tr>
@@ -52,7 +52,7 @@ function GetIt(bibno,title)
     <!-- /TMPL_LOOP -->
     </table>
 <!-- TMPL_ELSE -->
-<h2>No result found for <b><!-- TMPL_VAR NAME="query" --></b></h2>
+<h2>No results found for <b><!-- TMPL_VAR NAME="query" --></b></h2>
 <!-- /TMPL_IF-->
 <a onclick="Plugin(f)" href="">Search for another Biblio</a>
 <a class="button" href="#" onclick="window.close()">  Close</a></p>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl
index d767e82..77cac32 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl
@@ -180,7 +180,7 @@ function popup(subscriptionid) {
                     <input type="checkbox" disabled="disabled" />
                 <!--/TMPL_IF-->
             </p>
-            <p><label>Number Pattern:</label>
+            <p><label>Number pattern:</label>
                 <!-- TMPL_IF name="numberpattern1" -->
                     Number only
                 <!-- /TMPL_IF -->
@@ -349,11 +349,11 @@ function popup(subscriptionid) {
         <h2>Subscription summary</h2>
         <table cellpadding="0" cellspacing="0">
         <tr>
-            <td><label>Start Date :</label></td>
+            <td><label>Start date</label></td>
             <td> <!-- TMPL_VAR name="histstartdate" --> </td>
         </tr>
         <tr>
-            <td><label>End Date :</label></td>
+            <td><label>End date</label></td>
             <td> <!-- TMPL_VAR name="enddate" --></td>
         </tr>
                 <tr><td><label>Recieved issues</label></td><td><!-- TMPL_VAR name="recievedlist" --></td></tr>
@@ -370,4 +370,4 @@ function popup(subscriptionid) {
 <!-- 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/sms/sms-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/sms/sms-home.tmpl
index 56f7090..db83c3a 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/sms/sms-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/sms/sms-home.tmpl
@@ -20,13 +20,13 @@
 <legend>SMS Messaging</legend>
 <ol>
        <li><label for="message">Your Message: </label><textarea name="message" id="message" cols="35" rows="4"><!--TMPL_VAR NAME="message"--></textarea></li>
-       <li><label for="phone">Phone:</label><input type="text" name="phone" id="phone" value="<!--TMPL_VAR NAME="phone"-->"/> 5338644143</li>
+       <li><label for="phone">Phone:</label><input type="text" name="phone" id="phone" value="<!--TMPL_VAR NAME="phone"-->"/> (e.g., 5338644143)</li>
 </ol>
 </fieldset>
 <fieldset class="action"><input type="submit" value="Send SMS"></fieldset>
 </form>
 
-<div class="message">Şu anda sadece KTcell abonelerine mesaj gönderilebilir. Rezervasyonu gelenler için kullanın!</div>
+<div class="message">Enter a message. The message will be sent to the user.</div>
 
 </div>
 </div>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/acceptorreject.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/acceptorreject.tmpl
index 40209a1..6003fba 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/acceptorreject.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/acceptorreject.tmpl
@@ -137,7 +137,7 @@
                     <!-- /TMPL_IF -->
                     <br />
                     <!-- TMPL_IF name="copyrightdate" -->
-                        &copy <!-- TMPL_VAR name="copyrightdate" -->
+                        &copy; <!-- TMPL_VAR name="copyrightdate" -->
                     <!-- /TMPL_IF -->
                     <!-- TMPL_IF name="volumedesc" -->
                         ; Volume:<i><!-- TMPL_VAR name="volumedesc" --></i>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tmpl
index 15794ef..ee408c4 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tmpl
@@ -99,8 +99,8 @@
         <legend>Warnings</legend>
 
                <ul>
-                       <li><!-- TMPL_IF NAME="totalToDelete" --><!-- TMPL_VAR NAME="totalToDelete" --> <!-- TMPL_ELSE -->0 <!-- /TMPL_IF --> patrons will be deleted.</li>
-                       <li><!-- TMPL_IF NAME="totalToAnonymize" --><!-- TMPL_VAR NAME="totalToAnonymize" --> <!-- TMPL_ELSE -->0 <!-- /TMPL_IF --> check-out history will be anonymized.</li>
+                       <li><!-- TMPL_IF NAME="totalToDelete" --><!-- TMPL_VAR NAME="totalToDelete" --> <!-- TMPL_ELSE -->0 <!-- /TMPL_IF --> patrons will be deleted</li>
+                       <li><!-- TMPL_IF NAME="totalToAnonymize" --><!-- TMPL_VAR NAME="totalToAnonymize" --> <!-- TMPL_ELSE -->0 <!-- /TMPL_IF --> check-out history will be anonymized</li>
                </ul>
 
         <br />
@@ -116,7 +116,7 @@
             <!-- /TMPL_IF -->
             <!--TMPL_IF NAME="totalToAnonymize"-->
 
-                Check-out history for <!-- TMPL_VAR NAME="totalToAnonymize"--> patrons will be anonymized.
+                Check-out history for <!-- TMPL_VAR NAME="totalToAnonymize"--> patrons will be anonymized
                 <input type="hidden" name="do_anonym" value="<!-- TMPL_VAR NAME="totalToAnonymize" -->" />
             <!-- /TMPL_IF -->
                
@@ -137,17 +137,17 @@
 
           <!-- TMPL_IF NAME="do_delete" -->
                 <!-- TMPL_IF NAME="trash" -->
-                    <h4><!-- TMPL_VAR NAME="TotalDel" --> patrons have been successfuly moved to trash.</h4>
+                    <h4><!-- TMPL_VAR NAME="TotalDel" --> patrons have been successfuly moved to trash</h4>
                 <!-- TMPL_ELSE -->
-                    <h4><!-- TMPL_VAR NAME="TotalDel" --> patrons have been successfully deleted.</h4>
+                    <h4><!-- TMPL_VAR NAME="TotalDel" --> patrons have been successfully deleted</h4>
                 <!-- /TMPL_IF -->
                        <!-- TMPL_ELSE -->
-                               <h4>No patron records have been removed.</h4>
+                               <h4>No patron records have been removed</h4>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF NAME="do_anonym" -->
-                <h4>All patrons with checkouts older than <!-- TMPL_VAR NAME="filterdate1" --> have been anonymized.</h4>
+                <h4>All patrons with checkouts older than <!-- TMPL_VAR NAME="filterdate1" --> have been anonymized</h4>
                        <!-- TMPL_ELSE -->
-                               <h4>No patron records have been anonymized.</h4>
+                               <h4>No patron records have been anonymized</h4>
             <!-- /TMPL_IF -->
 
     </div>

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 c8f9361..877a447 100644 (file)
--- 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" />
-        separate by a blank. (e.g.: 100a 200 606)
+        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/import_borrowers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tmpl
index c07e5cc..321f685 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tmpl
@@ -22,7 +22,7 @@
        <li><!-- TMPL_VAR name="imported" --> imported records</li>
        <li><!-- TMPL_VAR name="overwritten" --> overwritten</li>
        <li><!-- TMPL_VAR name="alreadyindb" --> not imported because already in borrowers table and overwrite disabled</li>
-       <li><!-- TMPL_VAR name="invalid" --> not imported because they are not in the expected format !</li>
+       <li><!-- TMPL_VAR name="invalid" --> not imported because they are not in the expected format</li>
        <li><!-- TMPL_VAR name="total" -->  records parsed</li>
        <li><a href="/cgi-bin/koha/tools/tools-home.pl">Back</a></li>
 </ul>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl
index 5c72fc7..07dfebf 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl
@@ -155,7 +155,7 @@
         <input type="hidden" name="datelastseen" value="<!-- TMPL_VAR NAME="datelastseen" -->" />
         <input type="hidden" name="pagesize" value="<!-- TMPL_VAR NAME="pagesize" -->" />
         <input type="hidden" name="offset" value="<!-- TMPL_VAR NAME="prevoffset" -->" />
-        <input type="submit" value="&lt;&lt;&lt;" class="button" />
+        <input type="submit" value="&lt;&lt;" class="button" />
     </form>
     <!-- /TMPL_IF -->
     <!-- TMPL_IF NAME="nextoffset" -->
@@ -167,7 +167,7 @@
         <input type="hidden" name="datelastseen" value="<!-- TMPL_VAR NAME="datelastseen" -->" />
         <input type="hidden" name="pagesize" value="<!-- TMPL_VAR NAME="pagesize" -->" />
         <input type="hidden" name="offset" value="<!-- TMPL_VAR NAME="nextoffset" -->" />
-        <input type="submit" value="&gt;&gt;&gt;" class="button" />
+        <input type="submit" value="&gt;&gt;" class="button" />
     </form>
     <!-- /TMPL_IF -->
     <!-- /TMPL_IF -->