---
.../intranet-tmpl/prog/en/includes/admin-menu.inc | 2 +-
.../prog/en/modules/admin/admin-home.tmpl | 2 +-
.../prog/en/modules/admin/branches.tmpl | 16 ++++++++--------
.../prog/en/modules/help/acqui/orderreceive.tmpl | 2 +-
.../prog/en/modules/help/admin/aqbudget.tmpl | 2 +-
.../prog/en/modules/help/admin/smart-rules.tmpl | 2 +-
.../prog/en/modules/help/tools/holidays.tmpl | 4 ++--
.../prog/en/modules/help/tools/overduerules.tmpl | 2 +-
8 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
index c43ab7d..ed16f0c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
@@ -5,7 +5,7 @@
<h5>Basic parameters</h5>
<ul>
- <li><a href="/cgi-bin/koha/admin/branches.pl">Libraries, branches,
groups</a></li>
+ <li><a href="/cgi-bin/koha/admin/branches.pl">Libraries and
groups</a></li>
<li><a href="/cgi-bin/koha/admin/aqbookfund.pl">Funds and
budgets</a></li>
<li><a href="/cgi-bin/koha/admin/currency.pl">Currencies and exchange
rates</a></li>
<li><a href="/cgi-bin/koha/admin/itemtypes.pl">Item types and
circulation codes</a></li>
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 b254b77..bd4594f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl
@@ -25,7 +25,7 @@
<div class="hint"><h4>Hint:</h4><p>Configure these parameters in the order
they appear.</p></div>
<h3>Basic parameters</h3>
<dl>
- <dt><a href="/cgi-bin/koha/admin/branches.pl">Libraries, branches and
groups</a></dt>
+ <dt><a href="/cgi-bin/koha/admin/branches.pl">Libraries and
groups</a></dt>
<dd>Define libraries, branches and groups.</dd>
<dt><a href="/cgi-bin/koha/admin/aqbookfund.pl">Funds and
budgets</a></dt>
<dd>Funds and budgets administration for acquisitions.</dd>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl
index d973c21..5068691 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl
@@ -1,6 +1,6 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha › Administration › <!-- TMPL_IF NAME="editcategory"
--><!-- TMPL_IF NAME="categorycode" -->Libraries, branches, & Groups
› Edit Group <!-- TMPL_VAR NAME="categorycode" --><!-- TMPL_ELSE
-->Libraries, branches, & Groups › New Group<!-- /TMPL_IF --><!--
/TMPL_IF --><!-- TMPL_IF NAME="delete_category" -->Libraries, branches, &
Groups › Confirm Deletion of Group <!-- TMPL_VAR name="categorycode"
--><!-- /TMPL_IF --><!-- TMPL_IF name="add" -->
- <!-- TMPL_IF name="heading-branches-add-branch-p" -->New library<!--
TMPL_ELSE -->Libraries, branches, & Groups › Modify library <!--
TMPL_VAR name="branchcode" --><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF
name="delete_confirm" -->Libraries, branches, & Groups › Confirm
deletion of library '<!-- TMPL_VAR NAME="branchcode" -->'<!-- /TMPL_IF --><!--
TMPL_IF name="else" -->Libraries, branches, & Groups<!-- /TMPL_IF
--></title>
+<title>Koha › Administration › <!-- TMPL_IF NAME="editcategory"
--><!-- TMPL_IF NAME="categorycode" -->Libraries and Groups › Edit Group
<!-- TMPL_VAR NAME="categorycode" --><!-- TMPL_ELSE -->Libraries and Groups
› New Group<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF
NAME="delete_category" -->Libraries and Groups › Confirm Deletion of
Group <!-- TMPL_VAR name="categorycode" --><!-- /TMPL_IF --><!-- TMPL_IF
name="add" -->
+ <!-- TMPL_IF name="heading-branches-add-branch-p" -->New library<!--
TMPL_ELSE -->Libraries and Groups › Modify library <!-- TMPL_VAR
name="branchcode" --><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF
name="delete_confirm" -->Libraries and Groups › Confirm deletion of
library '<!-- TMPL_VAR NAME="branchcode" -->'<!-- /TMPL_IF --><!-- TMPL_IF
name="else" -->Libraries and Groups<!-- /TMPL_IF --></title>
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<script type="text/javascript" src="<!-- TMPL_VAR name="themelang"
-->/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
</head>
@@ -10,15 +10,15 @@
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a
href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> ›
-<!-- TMPL_IF NAME="editcategory" --><a
href="/cgi-bin/koha/admin/branches.pl">Libraries, Branches, & Groups</a>
› <!-- TMPL_IF NAME="categorycode" -->Edit Group <!-- TMPL_VAR
NAME="categorycode" --><!-- TMPL_ELSE -->New Group<!-- /TMPL_IF --><!--
/TMPL_IF -->
-<!-- TMPL_IF NAME="delete_category" --><a
href="/cgi-bin/koha/admin/branches.pl">Libraries, Branches, & Groups</a>
› Confirm Deletion of Group <!-- TMPL_VAR name="categorycode" --><!--
/TMPL_IF -->
+<!-- TMPL_IF NAME="editcategory" --><a
href="/cgi-bin/koha/admin/branches.pl">Libraries and Groups</a> › <!--
TMPL_IF NAME="categorycode" -->Edit Group <!-- TMPL_VAR NAME="categorycode"
--><!-- TMPL_ELSE -->New Group<!-- /TMPL_IF --><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="delete_category" --><a
href="/cgi-bin/koha/admin/branches.pl">Libraries and Groups</a> ›
Confirm Deletion of Group <!-- TMPL_VAR name="categorycode" --><!-- /TMPL_IF -->
-<!-- TMPL_IF name="add" --><a
href="/cgi-bin/koha/admin/branches.pl">Libraries, Branches, & Groups</a>
›
+<!-- TMPL_IF name="add" --><a href="/cgi-bin/koha/admin/branches.pl">Libraries
and Groups</a> ›
<!-- TMPL_IF name="heading-branches-add-branch-p" -->New library<!-- TMPL_ELSE
-->Modify library <!-- TMPL_VAR name="branchcode" --><!-- /TMPL_IF --><!--
/TMPL_IF -->
-<!-- TMPL_IF name="delete_confirm" --><a
href="/cgi-bin/koha/admin/branches.pl">Libraries, Branches, & Groups</a>
› Confirm deletion of library '<!-- TMPL_VAR NAME="branchcode" -->'<!--
/TMPL_IF -->
+<!-- TMPL_IF name="delete_confirm" --><a
href="/cgi-bin/koha/admin/branches.pl">Libraries and Groups</a> ›
Confirm deletion of library '<!-- TMPL_VAR NAME="branchcode" -->'<!-- /TMPL_IF
-->
-<!-- TMPL_IF name="else" -->Libraries, Branches, & Groups<!-- /TMPL_IF -->
+<!-- TMPL_IF name="else" -->Libraries and Groups<!-- /TMPL_IF -->
</div>
@@ -204,7 +204,7 @@
<!-- /TMPL_LOOP --></tbody>
</table>
<!-- TMPL_ELSE -->
- <div class="dialog message">There are no branches defined. <a
href="/cgi-bin/koha/admin/branches.pl?op=add">Start defining
libraries</a>.</div>
+ <div class="dialog message">There are no libraries defined. <a
href="/cgi-bin/koha/admin/branches.pl?op=add">Start defining
libraries</a>.</div>
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="branchcategories" -->
diff --git
a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/orderreceive.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/orderreceive.tmpl
index e5a3f33..e742436 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/orderreceive.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/orderreceive.tmpl
@@ -8,7 +8,7 @@
<ul>
<li><strong>Volume/Copy </strong>for Serials</li>
<li><strong>Item Barcode</strong> scan or enter the barcode
that has been assigned to the item</li>
- <li><strong>Home Library </strong>choose the home
library/branch for the item from the drop down list</li>
+ <li><strong>Home Library </strong>choose the home library for
the item from the drop down list</li>
<li><strong>Item Type </strong>choose the item type from the
drop down.</li>
</ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudget.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudget.tmpl
index 5288c69..44dcad4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudget.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudget.tmpl
@@ -16,7 +16,7 @@ TIP: The first time you access this page, you will be asked
to add your first fu
<ul>
<li>Each fund has a unique fund code, limited to a maximum of
five characters, which identifies it</li>
<li>Enter in a fund name to provide more information for staff
members about the fund</li>
- <li>Funds can be library/branch specific if needed, but this is
an optional field</li>
+ <li>Funds can be library specific if needed, but this is an
optional field</li>
<li>Once a fund is created a budget can then be applied to
it</li>
<li>Click 'Add budget' next to the fund you want to edit</li>
<li>IMPORTANT: Your dates will not save correctly unless you
have set your date format ('dateformat') in the Global System Preferences under
'I18N/L10N'-- DO THIS BEFORE setting budgets</li>
diff --git
a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/smart-rules.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/smart-rules.tmpl
index 7ca62b0..3dbe3cc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/smart-rules.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/smart-rules.tmpl
@@ -19,6 +19,6 @@
<li><span style="background-color: #ffe599">
TIP: To modify a rule, create a new one with the same patron type and item
type</span></li>
<li>
- These rules can be applied to individual branches by
choosing them from the pull down at the top of the page, by default the rules
are applied to all branches</li>
+ These rules can be applied to individual libraries by
choosing them from the pull down at the top of the page, by default the rules
are applied to all libraries</li>
</ul>
</div> <!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/holidays.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/holidays.tmpl
index 987cc71..f3d3e46 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/holidays.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/holidays.tmpl
@@ -15,7 +15,7 @@
<ul>
<li>
<span style="background-color: #ffff99">
-TIP: At present you will have to enter holidays in for each branch, there is
no way to apply holidays to all branches at once.</span></li>
+TIP: At present you will have to enter holidays in for each library, there is
no way to apply holidays to all libraries at once.</span></li>
</ul></li>
<li>To add a new holiday, click on the date you'd like to add a
holiday to
<ul>
@@ -31,7 +31,7 @@ TIP: An example of a repeatable holiday would be Christmas,
New Year's or a staf
</ul></li>
<li>When you've entered the necessary data click 'Save'</li>
<li>Once saved your holiday will be color-coded on the
calendar</li>
- </ul><h3><strong>Why do I want to add holidays for my
branch?</strong></h3>After holidays are entered on the calendar, circulation
rules are then recalculated to taken in to account that library is closed and
there will be no one present to return items.
+ </ul><h3><strong>Why do I want to add holidays for my
library?</strong></h3>After holidays are entered on the calendar, circulation
rules are then recalculated to taken in to account that library is closed and
there will be no one present to return items.
<h3>How do I enable the Holiday Calendar? </h3>
<p>You can make use of the Holidays Calendar by turning on the proper system
preferences</p>
<ul>
diff --git
a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/overduerules.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/overduerules.tmpl
index fbed0ef..be874be 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/overduerules.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/overduerules.tmpl
@@ -10,7 +10,7 @@
<li>'Select a library' to define an overdue schedule
for</li>
<li>
<span style="background-color: #ffe599">
-TIP: If you would like to define one overdue schedule for ALL branches at
once, select 'Default'. This will apply the schedule you define to all the
branches in your system</span></li>
+TIP: If you would like to define one overdue schedule for ALL libraries at
once, select 'Default'. This will apply the schedule you define to all the
libraries in your system</span></li>
</ul>
<ul>
<li>For each patron type (left most column), enter a
number under the columns labeled 'Delay'. The number you enter represents
DAYS.<br/>
--
1.5.5.GIT
_______________________________________________
Koha-patches mailing list
[email protected]
http://lists.koha.org/mailman/listinfo/koha-patches
