standardized the use of the term "library" instead of "Branch" accross the
interface and opac
---
.../intranet-tmpl/prog/en/includes/admin-menu.inc | 2 +-
.../prog/en/includes/budgets-admin-toolbar.inc | 2 +-
.../intranet-tmpl/prog/en/includes/circ-menu.inc | 2 +-
.../intranet-tmpl/prog/en/includes/circ-menu.tt | 2 +-
.../prog/en/includes/error-messages.inc | 4 ++--
.../prog/en/modules/acqui/acqui-home.tt | 4 ++--
.../prog/en/modules/admin/admin-home.tt | 4 ++--
.../prog/en/modules/admin/aqbudget_owner_search.tt | 2 +-
.../prog/en/modules/admin/checkmarc.tt | 6 +++---
.../en/modules/admin/preferences/acquisitions.pref | 2 +-
.../prog/en/modules/admin/preferences/admin.pref | 2 +-
.../en/modules/admin/preferences/circulation.pref | 6 +++---
.../prog/en/modules/admin/preferences/opac.pref | 12 ++++++------
.../en/modules/admin/preferences/searching.pref | 2 +-
koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt | 2 +-
.../prog/en/modules/catalogue/detail.tt | 2 +-
.../prog/en/modules/cataloguing/additem.tt | 2 +-
.../intranet-tmpl/prog/en/modules/circ/returns.tt | 2 +-
.../prog/en/modules/circ/selectbranchprinter.tt | 2 +-
.../prog/en/modules/circ/waitingreserves.tt | 2 +-
.../modules/help/admin/branch_transfer_limits.tt | 4 ++--
.../prog/en/modules/help/admin/smart-rules.tt | 6 +++---
.../prog/en/modules/help/circ/branchtransfers.tt | 4 ++--
.../prog/en/modules/help/circ/returns.tt | 10 +++++-----
.../prog/en/modules/help/reports/itemslost.tt | 6 +++---
.../prog/en/modules/help/reports/manager.tt | 4 ++--
.../prog/en/modules/help/reserve/request.tt | 4 ++--
.../en/modules/help/serials/subscription-add.tt | 2 +-
.../prog/en/modules/help/tools/holidays.tt | 2 +-
.../prog/en/modules/help/tools/import_borrowers.tt | 2 +-
.../prog/en/modules/labels/label-edit-batch.tt | 2 +-
.../prog/en/modules/labels/label-manage.tt | 2 +-
.../prog/en/modules/patroncards/edit-batch.tt | 2 +-
.../prog/en/modules/patroncards/manage.tt | 2 +-
.../modules/reports/issues_by_borrower_category.tt | 4 ++--
.../prog/en/modules/reports/issues_stats.tt | 4 ++--
.../prog/en/modules/reports/itemslost.tt | 4 ++--
.../prog/en/modules/reports/serials_stats.tt | 4 ++--
.../prog/en/modules/serials/claims.tt | 4 ++--
.../prog/en/modules/serials/serials-collection.tt | 2 +-
.../prog/en/modules/tools/inventory.tt | 6 +++---
.../intranet-tmpl/prog/en/modules/tools/letter.tt | 4 ++--
.../prog/en/xslt/UNIMARCslim2OAIDC.xsl | 2 +-
.../opac-tmpl/prog/en/includes/opac-topissues.inc | 4 ++--
koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt | 4 ++--
.../opac-tmpl/prog/en/modules/opac-suggestions.tt | 2 +-
.../opac-tmpl/prog/en/modules/opac-topissues.tt | 2 +-
.../opac-tmpl/prog/en/modules/opac-userdetails.tt | 2 +-
48 files changed, 82 insertions(+), 82 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 e9537f4..4480398 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
@@ -18,7 +18,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/itemtypes.pl">Item types</a></li>
<li><a href="/cgi-bin/koha/admin/authorised_values.pl">Authorized
values</a></li>
</ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc
b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc
index ee24d76..9b816ce 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc
@@ -47,7 +47,7 @@
[% UNLESS ( CAN_user_acquisition_planning_manage )
%], id:'disabled' [% END %]
},
- { text: _("Plan by Branches"),
+ { text: _("Plan by libraries"),
url:
"/cgi-bin/koha/admin/aqplan.pl?budget_period_id=[% budget_period_id
%]&authcat=BRANCHES"
[% UNLESS ( CAN_user_acquisition_planning_manage )
%], id:'disabled' [% END %]
},
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
index 00dc445..472db64 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
@@ -58,7 +58,7 @@
[% END %]
[% END %][% END %]
<li>Category: [% categoryname %] ([% categorycode %])</li>
- <li>Home Library: [% IF ( branchname ) %][% branchname %][% ELSE %][%
branch %][% END %]</li>
+ <li>Home library: [% IF ( branchname ) %][% branchname %][% ELSE %][%
branch %][% END %]</li>
</ul></div>
<div id="menu">
<ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt
b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt
index 451cd98..84400bd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt
@@ -61,7 +61,7 @@ in the global namespace %]
[% END %]
[% END %][% END %]
<li>Category: [% borrower.description %] ([% borrower.categorycode %])</li>
- <li>Home Library: [% IF ( borrower.branchname ) %][% borrower.branchname
%][% ELSE %][% borrower.branch %][% END %]</li>
+ <li>Home library: [% IF ( borrower.branchname ) %][% borrower.branchname
%][% ELSE %][% borrower.branch %][% END %]</li>
</ul></div>
<div id="menu">
<ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/error-messages.inc
b/koha-tmpl/intranet-tmpl/prog/en/includes/error-messages.inc
index 173a16b..fe71f26 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/error-messages.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/error-messages.inc
@@ -80,7 +80,7 @@ window.onload=function(){
[% ELSIF ( 202 ) %]
An error has occurred. Please ask your system administrator to check
the error log for more details.
[% ELSIF ( 203 ) %]
- A non-existent or invalid branch code was supplied. Please <a
href="/cgi-bin/koha/circ/selectbranchprinter.pl">verify</a> that you have a
branch selected.
+ A non-existent or invalid library code was supplied. Please <a
href="/cgi-bin/koha/circ/selectbranchprinter.pl">verify</a> that you have a
library selected.
[% ELSIF ( 301 ) %]
An error has occurred while attempting to upload the image file.
Please ask you system administrator to check the error log for more details.
[% ELSIF ( 302 ) %]
@@ -90,7 +90,7 @@ window.onload=function(){
[% ELSIF ( 401 ) %]
An error has occurred and the item(s) was not added to batch [%
batch_id %]. Please have your system administrator check the error log for
details.
[% ELSIF ( 402 ) %]
- The item(s) was not added because the branch is not set. Please set
your branch before adding items to a batch.
+ The item(s) was not added because the library is not set. Please set
your library before adding items to a batch.
[% ELSIF ( 403 ) %]
An error has occurred and the item(s) was not removed from batch [%
batch_id %]. Please have your system administrator check the error log for
details.
[% ELSIF ( 404 ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt
b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt
index 03cdc2d..b8e81b7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt
@@ -79,7 +79,7 @@ $(document).ready(function() {
[% IF ( loop_budget ) %]
- <h3>All available funds[% IF ( branchname ) %] for [% branchname
%] branch[% END %]</h3>
+ <h3>All available funds[% IF ( branchname ) %] for [% branchname
%] library[% END %]</h3>
<!-- <a href="/cgi-bin/koha/admin/aqbookfund.pl" title="[ Manage funds
]">[ Manage ]</a>
<a href="/cgi-bin/koha/admin/budgetperiods.pl">manage budgets</a><br><br>
-->
@@ -92,7 +92,7 @@ $(document).ready(function() {
<tr>
<th>Fund</th>
<th>Owner</th>
- <th>Branch</th>
+ <th>Library</th>
<th>Amount</th>
<th>Ordered</th>
<th>Spent</th>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
index fe76ae8..83ebdf6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
@@ -30,8 +30,8 @@
<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>
- <dd>Define libraries, branches and groups.</dd>
+ <dt><a href="/cgi-bin/koha/admin/branches.pl">Libraries and
groups</a></dt>
+ <dd>Define libraries and groups.</dd>
<dt><a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a></dt>
<dd>Define item types used for circulation rules.</dd>
<dt><a href="/cgi-bin/koha/admin/authorised_values.pl">Authorized
values</a></dt>
diff --git
a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget_owner_search.tt
b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget_owner_search.tt
index 2f7574a..5fc623d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget_owner_search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget_owner_search.tt
@@ -52,7 +52,7 @@ function returnOwner(ownerId, ownerName){
<tr>
<th>Cardnumber</th>
<th>Name</th>
- <th>Branch</th>
+ <th>Library</th>
<th>Categorycode</th>
<th>Select?</th>
</tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt
b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt
index ffa2de5..d339c00 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt
@@ -118,13 +118,13 @@
<!-- -->
[% IF ( branches_empty ) %]
<tr>
- <td>branch not defined</td>
- <td>at least 1 branch must be defined</td>
+ <td>library not defined</td>
+ <td>at least 1 library must be defined</td>
</tr>
[% ELSE %]
<tr>
<td>OK</td>
- <td>at least 1 branch defined</td>
+ <td>at least 1 library defined</td>
</tr>
[% END %]
<!-- -->
diff --git
a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref
b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref
index 70e660d..4b1e13b 100644
---
a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref
+++
b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref
@@ -20,7 +20,7 @@ Acquisitions:
- pref: AcqViewBaskets
choices:
user: created by staff member.
- branch: from staff member's branch.
+ branch: from staff member's library.
all: in system, regardless of owner.
-
- Display currencies using the following format
diff --git
a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref
b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref
index f026c7e..f8c49b2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref
@@ -5,7 +5,7 @@ Administration:
- Use
- pref: KohaAdminEmailAddress
class: email
- - "as the email address for the administrator of Koha. (This is
the default From: address for emails unless there is one for the particular
branch, and is referred to when an internal error occurs.)"
+ - "as the email address for the administrator of Koha. (This is
the default From: address for emails unless there is one for the particular
library, and is referred to when an internal error occurs.)"
-
- Show
- pref: DebugLevel
diff --git
a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
index 64fe299..104527e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
@@ -151,13 +151,13 @@ Circulation:
choices:
yes: Do
no: "Don't"
- - automatically transfer items to their home branch when they are
returned.
+ - automatically transfer items to their home library when they are
returned.
-
- pref: UseBranchTransferLimits
choices:
yes: Enforce
no: "Don't enforce"
- - branch transfer limits based on
+ - library transfer limits based on
- pref: BranchTransferLimitsType
choices:
ccode: collection code
@@ -315,7 +315,7 @@ Circulation:
choices:
yes: Allow
no: "Don't allow"
- - a user to choose the branch to pick up a hold from.
+ - a user to choose the library to pick up a hold from.
-
- pref: ReservesNeedReturns
choices:
diff --git
a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
index 1acc414..aeab7fa 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
@@ -317,7 +317,7 @@ OPAC:
choices:
yes: "Don't allow"
no: Allow
- - patrons to select their branch on the OPAC.
+ - patrons to select their library on the OPAC.
-
- pref: SearchMyLibraryFirst
choices:
@@ -352,9 +352,9 @@ OPAC:
- Use
- pref: OpacRenewalBranch
choices:
- itemhomebranch: "the item's home branch"
- patronhomebranch: "the patron's home branch"
- checkoutbranch: "the branch the item was checked out from"
+ itemhomebranch: "the item's home library"
+ patronhomebranch: "the patron's home library"
+ checkoutbranch: "the library the item was checked out from"
null: "NULL"
opacrenew: "'OPACRenew'"
- as branchcode to store in the statistics table.
@@ -375,7 +375,7 @@ OPAC:
choices:
no: "Don't allow"
yes: Allow
- - patrons to select branch when making a purchase suggestion
+ - patrons to select library when making a purchase suggestion
-
- pref: OpacHiddenItems
type: textarea
@@ -435,7 +435,7 @@ OPAC:
choices:
yes: Use
no: "Don't use"
- - "the item home branch when finding items for the shelf browser."
+ - "the item home library when finding items for the shelf
browser."
-
- pref: ShelfBrowserUsesCcode
default: 0
diff --git
a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref
b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref
index f4b02cc..e187702 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref
@@ -159,7 +159,7 @@ Searching:
choices:
yes: Show
no: "Don't show"
- - "an item's branch, location and call number in OPAC search
results."
+ - "an item's library, location and call number in OPAC search
results."
-
- Truncate facets length to
- pref: FacetLabelTruncationLength
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt
b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt
index 9289f46..6d86a62 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt
@@ -28,7 +28,7 @@
[% END %]
[% IF ( wrongip ) %]
-<div id="login_error"><strong>Error: </strong>Independent Branches and
Autolocation are switched on and you are logging in with an IP address that
doesn't match your branch. </div>
+<div id="login_error"><strong>Error: </strong>IndependentBranches and
Autolocation are switched on and you are logging in with an IP address that
doesn't match your library. </div>
[% END %]
[% IF ( invalid_username_or_password ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
index 858c2d6..4d0641f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
@@ -481,7 +481,7 @@ function verify_images() {
<p> (There are [% subscriptionsnumber %] subscriptions associated with
this title).</p>
[% FOREACH subscription IN subscriptions %]
[% IF ( subscription.branchname ) %]<h3>At library: [%
subscription.branchname %]</h3>[% ELSE %]
- [% IF ( subscription.branchcode ) %]<h3>At branch: [%
subscription.branchcode %]</h3>[% END %][% END %]
+ [% IF ( subscription.branchcode ) %]<h3>At library: [%
subscription.branchcode %]</h3>[% END %][% END %]
[% IF ( subscription.subscriptionnotes ) %]<p>[%
subscription.subscriptionnotes %] </p>[% END %]
[% IF ( subscription.latestserials ) %]
<p> The [% subscription.staffdisplaycount %] latest issues related
to this subscription:</p>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
index 008af82..934ae71 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
@@ -188,7 +188,7 @@ function set_to_today(id, force) {
[% IF ( no_next_barcode ) %]<div class="dialog alert"><strong>Error saving
items</strong>: Unable to automatically determine values for barcodes. No item
has been inserted.</div>[% END %]
[% IF ( book_on_loan ) %]<div class="dialog alert"><strong>Cannot
Delete</strong>: item is checked out.</div>[% END %]
[% IF ( book_reserved ) %]<div class="dialogalert"><strong>Cannot
Delete</strong>: item has a waiting hold.</div>[% END %]
-[% IF ( not_same_branch ) %]<div class="dialog alert"><strong>Cannot
Delete</strong>: The items do not belong to your branch.</div>[% END %]
+[% IF ( not_same_branch ) %]<div class="dialog alert"><strong>Cannot
Delete</strong>: The items do not belong to your library.</div>[% END %]
[% IF ( linked_analytics ) %]<div class="dialog alert"><strong>Cannot
Delete</strong>: item has linked <a
href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber
%]&analyze=1">analytics.</a>.</div>[% END %]
<div id="cataloguing_additem_itemlist">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
index 004a44e..65ce0f6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
@@ -195,7 +195,7 @@ function Dopop(link) {
[% END %]
[% IF ( transfer ) %]
- <!-- transfer: item with no reservation, must be returned to its
homebranch -->
+ <!-- transfer: item with no reservation, must be returned to its home
library -->
<div id="return1" class="dialog message">
<h3>Please return <a
href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[%
itembiblionumber %]">[% title or "item" |html %]</a> to [% homebranchname
%]<br/>( <a href="#" onclick="Dopop('transfer-slip.pl?transferitem=[%
itemnumber %]&branchcode=[% homebranch %]&op=slip'); return
true;">Print Slip</a> )</h3>
</div>
diff --git
a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt
b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt
index 40141be..9b77e68 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt
@@ -50,7 +50,7 @@ Updated:<ul>
<legend>Set Library</legend>
<ol>
[% IF ( singleBranchMode ) %]
- <li>Single Branch mode is ON.</li>
+ <li>SingleBranchMode is ON.</li>
[% ELSE %]
<li><label for="branch">Choose library:</label>
<select name="branch" id="branch">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
index 3ec2707..0de1f0f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
@@ -41,7 +41,7 @@ $.tablesorter.addParser({
<h2>Holds awaiting pickup for your library on: [% show_date %]
[% IF ( all_branches_link ) %]
<span style="margin-left:20px"><a href="[% all_branches_link %]">
- View all branches</a></span>
+ View all libraries</a></span>
[% END %]
</h2>
[% IF ( cancel_result ) %]
diff --git
a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branch_transfer_limits.tt
b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branch_transfer_limits.tt
index 168d69c..8618530 100644
---
a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branch_transfer_limits.tt
+++
b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branch_transfer_limits.tt
@@ -14,8 +14,8 @@
<p>Check the boxes for the libraries that you accept checkins from for the
item type you have selected at the top.</p>
-<p>In the above example, Centerville library will allow patrons to return
items from all libraries except Liberty and Franklin to their branch.</p>
+<p>In the above example, Centerville library will allow patrons to return
items from all libraries except Liberty and Franklin to their library.</p>
<p><strong>See the full documentation for Library Transfer Limits in the <a
href="http://manual.koha-community.org/3.6/en/patscirc.html#libtransferlimits";>manual</a>
(online).</strong></p>
-[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
+[% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/smart-rules.tt
b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/smart-rules.tt
index 3f63222..f97ae22 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/smart-rules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/smart-rules.tt
@@ -16,13 +16,13 @@
<li>all libraries, all patron types, all item types</li>
</ul>
-<p style="background-color: #ffe599;">Tip: If you are a single library system
choose your branch name before creating rules (sometimes having only rules for
the 'all libraries' option can cause issues with holds)</p>
+<p style="background-color: #ffe599;">Tip: If you are a single library system
choose your library name before creating rules (sometimes having only rules for
the 'all libraries' option can cause issues with holds)</p>
<p style="color: #990000;">Important: At the very least you will need to set a
default circulation rule. This rule should be set for all item types, all
libraries and all patron categories. That will catch all instances that do not
match a specific rule. When checking out if you do not have a rule for all
libraries, all item types and all patron types then you may see patrons getting
blocked from placing holds. You will also want a rule for your specific library
set for all item types and all patron types to avoid this holds issue. Koha
needs to know what rule to fall back on.</p>
<h2>Default Circulation Rules</h2>
-<p>Using the issuing rules matrix you can define rules that depend on
patron/item type combos. To set your rules, choose a library from the pull down
(or 'all libraries' if you want to apply these rules to all branches):</p>
+<p>Using the issuing rules matrix you can define rules that depend on
patron/item type combos. To set your rules, choose a library from the pull down
(or 'all libraries' if you want to apply these rules to all libraries):</p>
<p>From the matrix you can choose any combination of patron categories and
item types to apply the rules to</p>
<ul>
@@ -83,7 +83,7 @@
<p style="color: #990000;">Important: Note that if the system preference
AllowHoldPolicyOverride set to 'allow', these policies can be overridden by
your circulation staff.</p>
-<p style="color: #990000;">Important: These policies are based on the patron's
home branch, not the branch that the reserving staff member is from.</p>
+<p style="color: #990000;">Important: These policies are based on the patron's
home library, not the library that the reserving staff member is from.</p>
<p><strong>See the full documentation for Circulation and Fine Rules in the <a
href="http://manual.koha-community.org/3.6/en/patscirc.html#circfinerules";>manual</a>
(online).</strong></p>
diff --git
a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/branchtransfers.tt
b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/branchtransfers.tt
index 7382f4c..c89baf6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/branchtransfers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/branchtransfers.tt
@@ -2,7 +2,7 @@
<h1>Transfers</h1>
-<p>If you work in a multi-branch system you can transfer items from one
library to another by using the Transfer tool. To transfer an item</p>
+<p>If you work in a multi-library system you can transfer items from one
library to another by using the Transfer tool. To transfer an item</p>
<ul>
<li>Click 'Transfer' on the Circulation page
@@ -13,7 +13,7 @@
</li>
<li>Click 'Submit'</li>
<li>The item will now say that it is in transit</li>
- <li>When the item arrives at the other branch the librarian must check
the item in to acknowledge that it is no longer in transit</li>
+ <li>When the item arrives at the other library the librarian must check
the item in to acknowledge that it is no longer in transit</li>
<li>The item will not be permanently moved to the new library
<ul>
<li>The item shows the same 'Home Library' but has updated the 'Current
Location' to note where it resides at this time</li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/returns.tt
b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/returns.tt
index 29a5421..613a626 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/returns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/returns.tt
@@ -27,12 +27,12 @@
<p>There are several messages that can appear when checking items in:</p>
<ul>
- <li>If you are checking an item in at a library other than the home
branch, a message will appear asking you to transfer the book to the home
library
+ <li>If you are checking an item in at a library other than the home
library, a message will appear asking you to transfer the book to the home
library
<ul>
<li>After this item is checked in the status of the item will be
changed in the catalog to 'in transit'</li>
- <li>To mark an item as back at the home branch, check the item in at
the home branch
+ <li>To mark an item as back at the home library, check the item in at
the home library
<ul>
- <li>A message will appear tell you that the item is not checked out,
but the status will now say available in the catalog. This step is necessary to
mark items as received by the home branch.</li>
+ <li>A message will appear tell you that the item is not checked out,
but the status will now say available in the catalog. This step is necessary to
mark items as received by the home library.</li>
</ul>
</li>
</ul>
@@ -44,7 +44,7 @@
<li>Ignoring the hold will leave the item on hold, but leave its status
as Available (it will not cancel the hold)</li>
</ul>
</li>
- <li>If you're checking in an item that has a hold on it at another
branch you will be prompted to confirm and transfer the item
+ <li>If you're checking in an item that has a hold on it at another
library you will be prompted to confirm and transfer the item
<ul>
<li>Clicking the Confirm hold and Transfer button will mark the item as
in transit to the library where the hold was placed</li>
<li>Clicking the Print Slip, Transfer and Confirm button will mark the
item as in transit to the library where the hold was placed and present the
library with a receipt to print and place on the book with the patron's
information</li>
@@ -55,4 +55,4 @@
<p><strong>See the full documentation for Checking In in the <a
href="http://manual.koha-community.org/3.6/en/checkingin.html";>manual</a>
(online).</strong></p>
-[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
+[% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/itemslost.tt
b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/itemslost.tt
index 425a31d..3bd1c3a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/itemslost.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/itemslost.tt
@@ -2,14 +2,14 @@
<h1>Lost Items</h1>
-<p> This one-step report will show you how many items of each item type are
currently in your branch library or libraries.</p>
+<p> This one-step report will show you how many items of each item type are
currently in your library or libraries.</p>
<ul>
<li>Go to the 'Reports' module (usually under 'More' in
your Global Nav)</li>
<li>Choose 'Lost Items' under 'Other'</li>
<li>Choose category to 'Order by' (the 'order by' field
effects what ordering method is used when displaying the lost items)</li>
<li>Enter a 'Barcode' if searching for a single item;
if not leave this field blank</li>
- <li>Choose a 'Branch' to perform the report on (or
choose 'All' field at the top of the dropdown menu to choose all branches)</li>
+ <li>Choose a 'Library' to perform the report on (or
choose 'All' field at the top of the dropdown menu to choose all libraries)</li>
<li>Choose an 'Item Type' to perform the report on (or,
leave at the default 'All' to perform the report on all item types)</li>
<li>Choose a 'Lost Status' to search only for items
that are assumed lost (long overdue), missing, or lost (or, leave this set to
'All' to see all lost items)</li>
<li>Click 'Submit'</li>
@@ -18,4 +18,4 @@
<p><strong>See the full documentation for the Lost Items report in the <a
href="http://manual.koha-community.org/3.6/en/statsreports.html#lostreport";>manual</a>
(online).</strong></p>
-[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
+[% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/manager.tt
b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/manager.tt
index 37d686c..21bc077 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/manager.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/manager.tt
@@ -2,7 +2,7 @@
<h1>Catalog by Item Type</h1>
-<p>This report will list the total number of items of each item type per
branch.</p>
+<p>This report will list the total number of items of each item type per
library.</p>
<p>If you choose to output to the browser your results will print to the
screen.</p>
@@ -10,4 +10,4 @@
<p><strong>See the full documentation for the Catalog by Item Type report in
the <a
href="http://manual.koha-community.org/3.6/en/statsreports.html#catbyitem";>manual</a>
(online).</strong></p>
-[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
+[% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reserve/request.tt
b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reserve/request.tt
index 3d7381b..4053388 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reserve/request.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reserve/request.tt
@@ -60,7 +60,7 @@
<p>When you check in an item that has a hold on it the system will ask you to
either confirm and transfer the item or just confirm the hold</p>
-<p>Clicking the Confirm button will mark the item as on hold for the patron.
If the item needs to be transferred the item will also be marked as in transit
to the proper branch. Clicking 'Ignore' will retain the hold, but allow you to
check the item out to another patron. Choosing to confirm and print will
present you with a printable page that you can slip inside the book with the
necessary hold and/or transfer information.</p>
+<p>Clicking the Confirm button will mark the item as on hold for the patron.
If the item needs to be transferred the item will also be marked as in transit
to the proper library. Clicking 'Ignore' will retain the hold, but allow you to
check the item out to another patron. Choosing to confirm and print will
present you with a printable page that you can slip inside the book with the
necessary hold and/or transfer information.</p>
<p>Once confirmed the hold will show on the patron record and on the checkout
screen under the 'Hold' tab.</p>
@@ -72,4 +72,4 @@
<p><strong>See the full documentation for Holds in the <a
href="http://manual.koha-community.org/3.6/en/holds.html";>manual</a>
(online).</strong></p>
-[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
+[% INCLUDE 'help-bottom.inc' %]
diff --git
a/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/subscription-add.tt
b/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/subscription-add.tt
index ac3d337..d16fe4b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/subscription-add.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/subscription-add.tt
@@ -22,7 +22,7 @@
<li>Next you can choose whether a new item is created when receiving an
issue</li>
<li>'Location' is for the shelving location</li>
<li>'Call Number' is for your item's call number prefix</li>
- <li>'Library' is the branch that owns this subscription.
+ <li>'Library' is the library that owns this subscription.
<ul>
<li>If more than one library subscribes to this serial you will need to
create a subscription for each library</li>
<li>This can be done easily by using the 'Edit as New (Duplicate)'
option found on the subscription information page and changing only the
'Library' field</li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/holidays.tt
b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/holidays.tt
index 5ff99ed..b34e684 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/holidays.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/holidays.tt
@@ -19,7 +19,7 @@
<h2>Adding Events</h2>
-<p>Before adding events, choose the library you would like to apply the
closings to. When adding events you will be asked if you would like to apply
the event to one branch or all branches. To add events, simply</p>
+<p>Before adding events, choose the library you would like to apply the
closings to. When adding events you will be asked if you would like to apply
the event to one library or all libraries. To add events, simply</p>
<ul>
<li>Click on the date on the calendar that you would like to apply the
closing to</li>
diff --git
a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/import_borrowers.tt
b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/import_borrowers.tt
index 6f8a0bb..65cd1db 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/import_borrowers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/import_borrowers.tt
@@ -44,7 +44,7 @@
<li>Choose your CSV file and choose to match on 'Cardnumber' to prevent
adding of duplicate card numbers to the system</li>
<li>Next you can choose default values to apply to all patrons you are
importing
<ul>
- <li>ex. If you're importing patrons specific to one branch you can use
the field on the Import form to apply the branch code to all those you are
importing.</li>
+ <li>ex. If you're importing patrons specific to one library you can use
the field on the Import form to apply the branchcode to all those you are
importing.</li>
</ul>
</li>
<li>Finally you need to decide on what data you want to replace if
there are duplicates.
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt
b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt
index 9a1708e..1da5830 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt
@@ -37,7 +37,7 @@
[% INCLUDE 'labels-batches-toolbar.inc' %]
<div class="yui-g">
<div class="yui-u first" id="manage-label-batches">
- <div class="hint">Current Branch: [%
LoginBranchname %]</div>
+ <div class="hint">Current Library: [%
LoginBranchname %]</div>
<form name="add_by_barcode"
action="/cgi-bin/koha/labels/label-edit-batch.pl" method="post">
<div>
<fieldset class="rows"
style="border-bottom: 0px; border: 0px;">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt
b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt
index 4b3fdea..2e6bbd7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt
@@ -95,7 +95,7 @@
[% INCLUDE 'labels-toolbar.inc' %]
<div class="yui-gc">
<div class="yui-u first" id="manage-label-layouts">
- <div class="hint">Current Branch: [%
LoginBranchname %]</div>
+ <div class="hint">Current Library: [%
LoginBranchname %]</div>
[% IF ( table_loop ) %]
<form name="layouts"
action="/cgi-bin/koha/label-manage.pl?label_element=[% label_element %]">
<h2>Currently Available [% label_element_title
%]</h2>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt
b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt
index 31010c4..4eab7b2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt
@@ -37,7 +37,7 @@
[% INCLUDE 'error-messages.inc' %]
<div class="yui-g">
<div class="yui-u first"
id="manage-patroncard-batches">
- <div class="hint">Current Branch: [%
LoginBranchname %]</div>
+ <div class="hint">Current Library: [%
LoginBranchname %]</div>
[% IF ( table_loop ) %]
<form name="items" class="checkboxed">
<h2>Items in batch number [% batch_id
%]</h2>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt
b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt
index adf966e..0185d47 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt
@@ -133,7 +133,7 @@
[% INCLUDE 'error-messages.inc' %]
<div class="yui-gc">
<div class="yui-u first"
id="manage-patroncards-layouts">
- <div class="hint">Current Branch: [%
LoginBranchname %]</div>
+ <div class="hint">Current Library: [%
LoginBranchname %]</div>
[% IF ( table_loop ) %]
<form name="layouts"
action="/cgi-bin/koha/manage.pl?card_element=[% card_element %]">
<h2>Currently Available [% card_element_title
%]</h2>
diff --git
a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_by_borrower_category.tt
b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_by_borrower_category.tt
index d6da16c..679d22b 100644
---
a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_by_borrower_category.tt
+++
b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_by_borrower_category.tt
@@ -60,7 +60,7 @@
<option value="[% loopcategorie.value %]" >[%
loopcategorie.description %] </option>
[% END %]
</select></li>
- <li><label for="branch">Select a branch:</label> [% CGIbranch
%]</li></ol></fieldset>
+ <li><label for="branch">Select a library:</label> [% CGIbranch
%]</li></ol></fieldset>
<fieldset class="action"><input type="submit" value="Submit" />
<input type="hidden" name="report_name" value="[% report_name
%]" />
<input type="hidden" name="do_it" value="1" /></fieldset>
@@ -73,4 +73,4 @@
[% INCLUDE 'reports-menu.inc' %]
</div>
</div>
-[% INCLUDE 'intranet-bottom.inc' %]
\ No newline at end of file
+[% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt
b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt
index b224078..4b7a668 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt
@@ -275,7 +275,7 @@
</td>
</tr>
[% END %]
- <tr><td>Home branch</td>
+ <tr><td>Home library</td>
<td><input type="radio" name="Line" value="items.homebranch"
/></td>
<td><input type="radio" name="Column" value="items.homebranch"
/></td>
<td><select name="Filter" id="homebranch">
@@ -287,7 +287,7 @@
</td>
</tr>
- <tr><td>Holding branch</td>
+ <tr><td>Holding library</td>
<td><input type="radio" name="Line" value="items.holdingbranch"
/></td>
<td><input type="radio" name="Column" value="items.holdingbranch"
/></td>
<td><select name="Filter" id="holdingbranch">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt
b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt
index 6210768..ebafbaa 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt
@@ -37,7 +37,7 @@
<th>Rep.Price</th>
<th>Library</th>
<th>Itemtype</th>
- <th>Holdingbranch</th>
+ <th>Current location</th>
<th>Location</th>
<th>Notes</th>
</tr>
@@ -75,7 +75,7 @@
<option value=""> --- </option>
<option value="title">Title</option>
<option value="author">Author</option>
- <option value="homebranch">Library</option>
+ <option value="homebranch">Home library</option>
<option value="itype">Itemtypes</option>
<option value="barcode">Barcode</option>
<option value="price">Price</option>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt
b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt
index 29fad1d..298b237 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt
@@ -74,10 +74,10 @@
</select>
</li><li>
<label for="branch">
- Branch:
+ Library:
</label>
<select name="branchcode" id="branchcode">
- <option value="">Any Branch</option>
+ <option value="">Any library</option>
[% FOREACH branche IN branches %]
<option value="[%
branche.branchcode %]">[% branche.branchname %]</option>
[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt
b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt
index ceb1570..506ece1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt
@@ -214,7 +214,7 @@
<li>
<label for="titlefilter">Title : </label>
<input id="titlefilter" type="text" />
- <label for="branchfilter">Branch: </label>
+ <label for="branchfilter">Library: </label>
<select id="branchfilter" onchange="filterByBranch();">
[% FOREACH branchloo IN branchloop %]
[% IF ( branchloo.selected ) %]
@@ -271,7 +271,7 @@
<th><input type="checkbox" id="CheckAll"></th>
[% END %]
<th>Vendor</th>
- <th>Branch</th>
+ <th>Library</th>
<th>Title</th>
<th>Issue number</th>
<th>Status</th>
diff --git
a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
index a0d4bb5..1293f56 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
@@ -208,7 +208,7 @@ $(document).ready(function() {
</th>
<th>Notes
</th>
- <th>Branch
+ <th>Library
</th>
[% IF ( routing ) %]<th>Routing</th>[% END %]
[% IF ( CAN_user_serials_receive_serials ) %]<th>Edit</th>[%
END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt
b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt
index f95a943..e3071a2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt
@@ -76,9 +76,9 @@ $(document).ready(function(){
<fieldset class="rows">
<legend>Select items you want to check</legend>
<ol><li>
- <label for="branch">Branch</label>
- <input type="radio" name="branch" value="homebranch">Home
Branch</input>
- <input type="radio" name="branch" value="holdingbranch">Holding
Branch</input>
+ <label for="branch">Library</label>
+ <input type="radio" name="branch" value="homebranch">Home
library</input>
+ <input type="radio" name="branch" value="holdingbranch">Current
location</input>
</li><li>
<label for="branchloop">Library</label><select id="branchloop"
name="branchcode" style="width:12em;">
<option value="">All Locations</option>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
index 749d480..fd0aa92 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
@@ -163,7 +163,7 @@ $(document).ready(function() {
[% END %]
<table id="lettert">
<thead><tr>
- <th>Branch</th>
+ <th>Library</th>
<th>Module</th>
<th>Code</th>
<th>Name</th>
@@ -338,7 +338,7 @@ $(document).ready(function() {
<table>
<thead>
<tr>
- <th>Branch</th>
+ <th>Library</th>
<th>Module</th>
<th>Code</th>
<th>Name</th>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2OAIDC.xsl
b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2OAIDC.xsl
index 6352384..2580804 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2OAIDC.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2OAIDC.xsl
@@ -172,7 +172,7 @@
<dc:identifier>
<xsl:text>LOC:</xsl:text>
<xsl:choose>
- <xsl:when test="marc:subfield[@code='c']='MAIN'">Main Branch</xsl:when>
+ <xsl:when test="marc:subfield[@code='c']='MAIN'">Main
library</xsl:when>
<xsl:when test="marc:subfield[@code='c']='BIB2'">Library 2</xsl:when>
</xsl:choose>
<xsl:foreach select="marc:subfield[@code='k']">
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/opac-topissues.inc
b/koha-tmpl/opac-tmpl/prog/en/includes/opac-topissues.inc
index 1a1c0a6..20b1d9b 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/opac-topissues.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/opac-topissues.inc
@@ -15,7 +15,7 @@
<li>
<label for="branch">From: </label>
<select name="branch" id="branch" style="width: 10em;">
- <option value="">All branches</option>
+ <option value="">All libraries</option>
[% FOREACH branchloo IN branchloop %]
[% IF ( branch == branchname ) %]<option value="[%
branchloo.value %]" selected="selected">[% ELSE %]<option value="[%
branchloo.value %]">[% END %]
[% branchloo.branchname %]
@@ -44,4 +44,4 @@
</fieldset><fieldset class="action"><input type="submit" value="Submit"
/></fieldset>
</form>
-</div>
\ No newline at end of file
+</div>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
index 7af60a0..aace3e3 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
@@ -556,7 +556,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
<table id="serialcollectiont">
<thead>
<tr>
- <th>Branch</th>
+ <th>Library</th>
<th>Serial collection</th>
</tr>
</thead>
@@ -780,7 +780,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
<p>There are [% subscriptionsnumber %] subscription(s) associated with
this title.</p>
[% FOREACH subscription IN subscriptions %]
[% IF ( subscription.branchname ) %]<h3>At library: [%
subscription.branchname %]</h3>[% ELSE %]
- [% IF ( subscription.branchcode ) %]<h3>At branch: [%
subscription.branchcode %]</h3>[% END %][% END %]
+ [% IF ( subscription.branchcode ) %]<h3>At library: [%
subscription.branchcode %]</h3>[% END %][% END %]
[% IF ( subscription.subscriptionnotes ) %]<p>[%
subscription.subscriptionnotes %] </p>[% END %]
<p>Subscription from: [% subscription.histstartdate %] to:[% IF (
subscription.histenddate ) %] [% subscription.histenddate %] [% ELSE %] now
(current)[% END %]</p>
[% IF ( subscription.missinglist ) %]<p>Missing issues: [%
subscription.missinglist %] </p>[% END %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tt
b/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tt
index d8757bb..7897f0e 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tt
@@ -92,7 +92,7 @@ $.tablesorter.addParser({
[% END %]
</select> </li>
[% IF ( branch_loop ) %]
- <li><label for="branch">Branch:</label>
+ <li><label for="branch">Library:</label>
<select name="branch" id="branch">
[% FOREACH branch_loo IN branch_loop %]
[% IF ( branch_loo.selected ) %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tt
b/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tt
index dee3089..29296a7 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tt
@@ -100,7 +100,7 @@ function Dopop(link) {
<li>
<label for="branch">From: </label>
<select name="branch" id="branch">
- <option value="">All branches</option>
+ <option value="">All libraries</option>
[% FOREACH branchloo IN branchloop %]
[% IF ( branchloo.selected ) %]
<option value="[% branchloo.value %]"
selected="selected">[% branchloo.branchname %]</option>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tt
b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tt
index fdf0b49..2767436 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tt
@@ -45,7 +45,7 @@ Card Number:</th><td>[% cardnumber %]</td></tr>
<tr><th scope="row">Expires:</th><td>[% dateexpiry %]</td></tr>
-[% IF ( joiningbranch ) %]<tr><th>Joining Branch:</th><td>[% joiningbranch
%]</td></tr>[% ELSE %] [% END %]</table>
+[% IF ( joiningbranch ) %]<tr><th>Joining library:</th><td>[% joiningbranch
%]</td></tr>[% ELSE %] [% END %]</table>
<table>
<caption>Identity Details</caption>
--
1.7.5.4
_______________________________________________
Koha-patches mailing list
[email protected]
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/
