[open-ils-commits] [GIT] Evergreen ILS branch master updated. 03df8c998d896dea76901cc86ad37176d642b83b

Evergreen Git git at git.evergreen-ils.org
Tue Sep 18 15:44:48 EDT 2018


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  03df8c998d896dea76901cc86ad37176d642b83b (commit)
       via  5f90b07e588fffa5428ae8bcd9d4445e3150b01b (commit)
       via  5d28b84c87d11cac205ec3b74f758e8824d77536 (commit)
      from  664d4cde5a21191a88f05dd1751f45fb61703efb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 03df8c998d896dea76901cc86ad37176d642b83b
Author: Kathy Lussier <klussier at masslnc.org>
Date:   Wed Aug 22 19:46:10 2018 -0400

    LP#1538691: Release notes entry for consistent terminology
    
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
    Signed-off-by: Dan Wells <dbw2 at calvin.edu>

diff --git a/docs/RELEASE_NOTES_NEXT/Client/consistent-terminology.adoc b/docs/RELEASE_NOTES_NEXT/Client/consistent-terminology.adoc
new file mode 100644
index 0000000..38cfe3e
--- /dev/null
+++ b/docs/RELEASE_NOTES_NEXT/Client/consistent-terminology.adoc
@@ -0,0 +1,16 @@
+More consistent terminology in the client
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Terminology has been updated in the staff client so that we consistently use
+the same name to describe the same thing. The following updates have been made:
+
+  * The term 'item' is now consistently used to describe the barcoded entity
+that had been previously been called both an 'item' and a 'copy'. As a result,
+we now use the terms 'item buckets', 'item tags', and 'item alerts'.
+  * The term 'volume' is no longer used in the client, with the exception of
+serials, where the term is used to describe serial volumes. The term 'call 
+number' will replace volume in most other places.
+  *'Holdings' is a more general term used to describe a combination of items
+and call numbers.
+  * The term 'Shelving Location' is used consistently in favor of 'Copy
+Location.'
+

commit 5f90b07e588fffa5428ae8bcd9d4445e3150b01b
Author: Kathy Lussier <klussier at masslnc.org>
Date:   Wed Aug 22 16:48:43 2018 -0400

    LP#1538691: More changes to terminology
    
    For more consistency: Changing all staff client instances of Copy Location to
    Shelving Location. We also replace Volume with Call Number and use Holdings
    for a combination of copies/volumes. Also replacing the 'Add Copies' option
    on the bib record page with 'Add Holdings' as was previously discussed on
    the open-ils-general list.
    
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
    Signed-off-by: Dan Wells <dbw2 at calvin.edu>

diff --git a/Open-ILS/src/templates/conify/global/asset/copy_location_group.tt2 b/Open-ILS/src/templates/conify/global/asset/copy_location_group.tt2
index 560a4c4..43c5bd1 100644
--- a/Open-ILS/src/templates/conify/global/asset/copy_location_group.tt2
+++ b/Open-ILS/src/templates/conify/global/asset/copy_location_group.tt2
@@ -1,5 +1,5 @@
 [% WRAPPER base.tt2 %]
-[% ctx.page_title = l('Copy Location Group') %]
+[% ctx.page_title = l('Shelving Location Group') %]
 <script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/conify/global/asset/copy_location_group.js'> </script>
 <link rel='stylesheet' type='text/css' href='[% ctx.media_prefix %]/js/dojo/dojo/resources/dnd.css'/>
 <style>
@@ -54,7 +54,7 @@
 </style>
 
 <div id='acplg-header'>
-    <span>[% l('Copy Location Groups') %]</span>
+    <span>[% l('Shelving Location Groups') %]</span>
     <select dojoType="openils.widget.OrgUnitFilteringSelect"
             jsId='contextOrgSelector'
             searchAttr='shortname'
@@ -95,7 +95,7 @@
         <div>
             <table width='100%'><tr>
                 <td align='left'><button onclick='editLocations("create")'>[% l('← Add') %]</button></td>
-                <td align='right' style='padding-right:5px;'>[% l('Copy Locations') %]</td>
+                <td align='right' style='padding-right:5px;'>[% l('Shelving Locations') %]</td>
             </tr></table>
         </div>
         <div style='height:400px; overflow-y:scroll'>
diff --git a/Open-ILS/src/templates/conify/global/asset/copy_location_order.tt2 b/Open-ILS/src/templates/conify/global/asset/copy_location_order.tt2
index 97304b7..c77a23f 100644
--- a/Open-ILS/src/templates/conify/global/asset/copy_location_order.tt2
+++ b/Open-ILS/src/templates/conify/global/asset/copy_location_order.tt2
@@ -1,10 +1,10 @@
 [% WRAPPER base.tt2 %]
-[% ctx.page_title = l('Copy Location Order') %]
+[% ctx.page_title = l('Shelving Location Order') %]
 <script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/conify/global/asset/copy_location_order.js'> </script>
 <link rel='stylesheet' type='text/css' href='[% ctx.media_prefix %]/js/dojo/dojo/resources/dnd.css'/>
 
 <div dojoType="dijit.layout.ContentPane" layoutAlign="client" class='oils-header-panel'>
-    <div>[% l('Copy Location Order') %]</div>
+    <div>[% l('Shelving Location Order') %]</div>
     <div></div>
 </div>
 
diff --git a/Open-ILS/src/templates/staff/admin/local/t_splash.tt2 b/Open-ILS/src/templates/staff/admin/local/t_splash.tt2
index 7407a7b..d9616c8 100644
--- a/Open-ILS/src/templates/staff/admin/local/t_splash.tt2
+++ b/Open-ILS/src/templates/staff/admin/local/t_splash.tt2
@@ -19,9 +19,9 @@
     ,[ l('Closed Dates Editor'), "./admin/local/actor/closed_dates" ]
     ,[ l('Item Alert Types'), "./admin/local/config/copy_alert_types" ]
     ,[ l('Item Alert Suppression'), "./admin/local/actor/copy_alert_suppress" ]
-    ,[ l('Copy Location Groups'), "./admin/local/asset/copy_location_group" ]
-    ,[ l('Copy Location Order'), "./admin/local/asset/copy_location_order" ]
-    ,[ l('Copy Locations Editor'), "./admin/local/asset/copy_locations" ]
+    ,[ l('Shelving Location Groups'), "./admin/local/asset/copy_location_group" ]
+    ,[ l('Shelving Location Order'), "./admin/local/asset/copy_location_order" ]
+    ,[ l('Shelving Locations Editor'), "./admin/local/asset/copy_locations" ]
     ,[ l('Item Tags'), "./admin/local/asset/copy_tag" ]
     ,[ l('Field Documentation'), "./admin/local/config/idl_field_doc" ]
     ,[ l('Group Penalty Thresholds'), "./admin/local/permission/grp_penalty_threshold" ]
@@ -37,7 +37,7 @@
     ,[ l('Statistical Popularity Badges'), "./admin/local/rating/badge" ]
     ,[ l('Surveys'), "./admin/local/action/survey" ]
     ,[ l('Transit List'), "./circ/transits/list" ]
-    ,[ l('Volume/Item Template Editor'), "./cat/volcopy/edit_templates" ]
+    ,[ l('Holdings Template Editor'), "./cat/volcopy/edit_templates" ]
     ,[ l('Work Log'), "./admin/workstation/log" ]
    ];
 
diff --git a/Open-ILS/src/templates/staff/cat/bucket/copy/index.tt2 b/Open-ILS/src/templates/staff/cat/bucket/copy/index.tt2
index 35b2d30..91d2f20 100644
--- a/Open-ILS/src/templates/staff/cat/bucket/copy/index.tt2
+++ b/Open-ILS/src/templates/staff/cat/bucket/copy/index.tt2
@@ -18,7 +18,7 @@
     s.OVERRIDE_DELETE_COPY_BUCKET_ITEMS_FROM_CATALOG_BODY =
       "[% l('Reason(s) include: [_1]', '{{evt_desc}}') %]";
     s.CONFIRM_TRANSFER_COPY_BUCKET_ITEMS_TO_MARKED_VOLUME =
-      "[% l('Are you sure you want to transfer selected items to the marked volume?') %]";
+      "[% l('Are you sure you want to transfer selected items to the marked call number?') %]";
     s.OVERRIDE_TRANSFER_COPY_BUCKET_ITEMS_TO_MARKED_VOLUME_TITLE =
       "[% l('One or more items could not be transferred. Override?') %]";
     s.OVERRIDE_TRANSFER_COPY_BUCKET_ITEMS_TO_MARKED_VOLUME_BODY =
diff --git a/Open-ILS/src/templates/staff/cat/bucket/copy/t_view.tt2 b/Open-ILS/src/templates/staff/cat/bucket/copy/t_view.tt2
index 8f2bbe2..edb83bc 100644
--- a/Open-ILS/src/templates/staff/cat/bucket/copy/t_view.tt2
+++ b/Open-ILS/src/templates/staff/cat/bucket/copy/t_view.tt2
@@ -18,7 +18,7 @@
     handler="spawnHoldingsEdit"></eg-grid-action>
   <eg-grid-action handler="print_labels" group="[% l('Show') %]"
     label="[% l('Print Labels') %]"></eg-grid-action>
-  <eg-grid-action label="[% l('Transfer Selected Items to Marked Volume') %]" group="[% l('Items') %]"
+  <eg-grid-action label="[% l('Transfer Selected Items to Marked Call Number') %]" group="[% l('Items') %]"
     handler="transferCopies"></eg-grid-action>
   <eg-grid-action label="[% l('Delete Selected Items from Catalog') %]" group="[% l('Items') %]"
     handler="deleteCopiesFromCatalog"></eg-grid-action>
diff --git a/Open-ILS/src/templates/staff/cat/catalog/index.tt2 b/Open-ILS/src/templates/staff/cat/catalog/index.tt2
index ec76905..ddb6a8c 100644
--- a/Open-ILS/src/templates/staff/cat/catalog/index.tt2
+++ b/Open-ILS/src/templates/staff/cat/catalog/index.tt2
@@ -27,21 +27,21 @@
 <script>
   angular.module('egCoreMod').run(['egStrings', function(s) {
     s.CONFIRM_DELETE_COPIES_VOLUMES =
-      "[% l('Permanently delete selected items and/or volumes from catalog?') %]";
+      "[% l('Permanently delete selected items and/or call numbers from catalog?') %]";
     s.CONFIRM_DELETE_COPIES_VOLUMES_MESSAGE =
-      "[% l('Will delete {{copies}} items and {{volumes}} volumes') %]";
+      "[% l('Will delete {{copies}} items and {{volumes}} call numbers') %]";
     s.CONFIRM_DELETE_PEERS =
       "[% l('Unlink selected conjoined items?') %]";
     s.CONFIRM_DELETE_PEERS_MESSAGE =
       "[% l('Will unlink {{peers}} items') %]";
     s.CONFIRM_TRANSFER_COPIES_TO_MARKED_VOLUME =                                                                                                                  
-      "[% l('Are you sure you want to transfer selected items to the marked volume?') %]";                                                                                   
+      "[% l('Are you sure you want to transfer selected items to the marked call number?') %]";                                                                                   
     s.OVERRIDE_TRANSFER_COPIES_TO_MARKED_VOLUME_TITLE =                                                                                                           
       "[% l('One or more items could not be transferred. Override?') %]";                                                                                                    
     s.OVERRIDE_TRANSFER_COPIES_TO_MARKED_VOLUME_BODY =                                                                                                            
       "[% l('Reason(s) include: [_1]', '{{evt_desc}}') %]";                
     s.VOLS_TRANSFERED =                                                                                                            
-      "[% l('Volume(s) transfered') %]";                
+      "[% l('Call Number(s) transfered') %]";                
     s.ITEMS_TRANSFERED =                                                                                                            
       "[% l('Item(s) transfered') %]";                
     s.HOLD_TRANSFER_DEST_MARKED =                                                                                                            
diff --git a/Open-ILS/src/templates/staff/cat/catalog/t_catalog.tt2 b/Open-ILS/src/templates/staff/cat/catalog/t_catalog.tt2
index 500575b..c9b733d 100644
--- a/Open-ILS/src/templates/staff/cat/catalog/t_catalog.tt2
+++ b/Open-ILS/src/templates/staff/cat/catalog/t_catalog.tt2
@@ -24,7 +24,7 @@
   <div class="col-md-6">
     <div class="pull-right">
     <button type="button" class="btn btn-default" ng-click="selectedHoldingsVolCopyAdd()">
-        [% l('Add Items') %]
+        [% l('Add Holdings') %]
     </button>
     <div class="btn-group" uib-dropdown dropdown-append-to-body>
         <button id="serials-button" type="button" class="btn btn-default" uib-dropdown-toggle>
diff --git a/Open-ILS/src/templates/staff/cat/catalog/t_choose_vol_target_lib.tt2 b/Open-ILS/src/templates/staff/cat/catalog/t_choose_vol_target_lib.tt2
index 74e02c0..0191d70 100644
--- a/Open-ILS/src/templates/staff/cat/catalog/t_choose_vol_target_lib.tt2
+++ b/Open-ILS/src/templates/staff/cat/catalog/t_choose_vol_target_lib.tt2
@@ -2,7 +2,7 @@
     <div class="modal-header">
       <button type="button" class="close" ng-click="cancel()" 
         aria-hidden="true">×</button>
-      <h4 class="modal-title">[% l('Choose volume transfer target') %]</h4>
+      <h4 class="modal-title">[% l('Choose call number transfer target') %]</h4>
     </div>
     <div class="modal-body">
       <div class="row">
diff --git a/Open-ILS/src/templates/staff/cat/catalog/t_holdings.tt2 b/Open-ILS/src/templates/staff/cat/catalog/t_holdings.tt2
index 8c41ea6..1912617 100644
--- a/Open-ILS/src/templates/staff/cat/catalog/t_holdings.tt2
+++ b/Open-ILS/src/templates/staff/cat/catalog/t_holdings.tt2
@@ -19,7 +19,7 @@
     persist-key="cat.holdings">
 
     <eg-grid-menu-item handler="holdings_checkbox_handler"
-      label="[% l('Show empty volumes') %]"
+      label="[% l('Show empty call numbers') %]"
       checkbox="holdings_show_empty"
       checked="holdings_show_empty"/>
 
@@ -29,12 +29,12 @@
       checked="holdings_show_empty_org"/>
 
     <eg-grid-menu-item handler="holdings_checkbox_handler"
-      label="[% l('Show Item detail') %]"
+      label="[% l('Show item detail') %]"
       checkbox="holdings_show_copies"
       checked="holdings_show_copies"/>
 
     <eg-grid-menu-item handler="holdings_checkbox_handler"
-      label="[% l('Show volume detail') %]"
+      label="[% l('Show call number detail') %]"
       checkbox="holdings_show_vols"
       checked="holdings_show_vols"/>
 
@@ -65,37 +65,37 @@
     <eg-grid-action handler="selectedHoldingsMissing" group="[% l('Mark') %]"
       label="[% l('Item as Missing') %]"></eg-grid-action>
     <eg-grid-action handler="markFromSelectedAsHoldingsTarget" group="[% l('Mark') %]"
-      label="[% l('Library/Volume as Transfer Destination') %]"></eg-grid-action>
+      label="[% l('Library/Call Number as Transfer Destination') %]"></eg-grid-action>
 
     <eg-grid-action handler="selectedHoldingsVolAdd" group="[% l('Add') %]"
-      label="[% l('Volumes') %]"></eg-grid-action>
+      label="[% l('Call Numbers') %]"></eg-grid-action>
     <eg-grid-action handler="selectedHoldingsCopyAdd" group="[% l('Add') %]" disabled="vols_not_shown"
       label="[% l('Items') %]"></eg-grid-action>
     <eg-grid-action handler="selectedHoldingsVolCopyAdd" group="[% l('Add') %]"
-      label="[% l('Volumes and Items') %]"></eg-grid-action>
+      label="[% l('Call Numbers and Items') %]"></eg-grid-action>
     <eg-grid-action handler="selectedHoldingsCopyAlertsAdd" group="[% l('Add') %]" disabled="vols_not_shown"
       label="[% l('Item Alerts') %]"></eg-grid-action>
 
     <eg-grid-action handler="selectedHoldingsVolEdit" group="[% l('Edit') %]"
-      label="[% l('Volumes') %]"></eg-grid-action>
+      label="[% l('Call Numbers') %]"></eg-grid-action>
     <eg-grid-action handler="selectedHoldingsCopyEdit" group="[% l('Edit') %]"
       label="[% l('Items') %]"></eg-grid-action>
     <eg-grid-action handler="selectedHoldingsVolCopyEdit" group="[% l('Edit') %]"
-      label="[% l('Volumes and Items') %]"></eg-grid-action>
+      label="[% l('Call Numbers and Items') %]"></eg-grid-action>
     <eg-grid-action handler="replaceBarcodes" group="[% l('Edit') %]"
       label="[% l('Replace Barcodes') %]"></eg-grid-action>
     <eg-grid-action handler="selectedHoldingsCopyAlertsManage" group="[% l('Edit') %]"
       label="[% l('Manage Item Alerts') %]"></eg-grid-action>
 
     <eg-grid-action handler="selectedHoldingsEmptyVolCopyDelete" group="[% l('Delete') %]" disabled="vols_not_shown"
-      label="[% l('Empty Volumes') %]"></eg-grid-action>
+      label="[% l('Empty Call Numbers') %]"></eg-grid-action>
     <eg-grid-action handler="selectedHoldingsCopyDelete" group="[% l('Delete') %]" disabled="copies_not_shown"
       label="[% l('Items') %]"></eg-grid-action>
     <eg-grid-action handler="selectedHoldingsVolCopyDelete" group="[% l('Delete') %]" disabled="copies_not_shown"
-      label="[% l('Volumes and Items') %]"></eg-grid-action>
+      label="[% l('Call Numbers and Items') %]"></eg-grid-action>
 
     <eg-grid-action handler="transferVolumes" group="[% l('Transfer') %]"
-      label="[% l('Volumes to Previously Marked Destination') %]"></eg-grid-action>
+      label="[% l('Call Numbers to Previously Marked Destination') %]"></eg-grid-action>
 
     <eg-grid-action handler="transferItems" group="[% l('Transfer') %]"
       label="[% l('Items to Previously Marked Destination') %]"></eg-grid-action>
diff --git a/Open-ILS/src/templates/staff/cat/item/index.tt2 b/Open-ILS/src/templates/staff/cat/item/index.tt2
index c661742..0a78281 100644
--- a/Open-ILS/src/templates/staff/cat/item/index.tt2
+++ b/Open-ILS/src/templates/staff/cat/item/index.tt2
@@ -19,15 +19,15 @@
 <script>
   angular.module('egCoreMod').run(['egStrings', function(s) {
     s.CONFIRM_DELETE_COPIES_VOLUMES =
-      "[% l('Permanently delete selected copies and/or volumes from catalog?') %]";
+      "[% l('Permanently delete selected items and/or call numbers from catalog?') %]";
     s.CONFIRM_DELETE_COPIES_VOLUMES_MESSAGE =
-      "[% l('Will delete {{copies}} copies and {{volumes}} volumes') %]";
+      "[% l('Will delete {{copies}} items and {{volumes}} call numbers') %]";
     s.CONFIRM_DELETE_PEERS =
-      "[% l('Unlink selected conjoined copies?') %]";
+      "[% l('Unlink selected conjoined items?') %]";
     s.CONFIRM_DELETE_PEERS_MESSAGE =
-      "[% l('Will unlink {{peers}} copies') %]";
+      "[% l('Will unlink {{peers}} items') %]";
     s.CONFIRM_TRANSFER_COPIES_TO_MARKED_VOLUME =
-      "[% l('Are you sure you want to transfer selected items to the marked volume?') %]";
+      "[% l('Are you sure you want to transfer selected items to the marked call number?') %]";
     s.OVERRIDE_TRANSFER_COPIES_TO_MARKED_VOLUME_TITLE =
       "[% l('One or more items could not be transferred. Override?') %]";
     s.OVERRIDE_TRANSFER_COPIES_TO_MARKED_VOLUME_BODY =
@@ -96,17 +96,17 @@
     
         <p><b>[% l('Add') %]</b></p>    
         <li><a href ng-click="selectedHoldingsCopyAdd()">[% l('Items') %]</a></li>
-        <li><a href ng-click="selectedHoldingsVolCopyAdd()">[% l('Volumes and Items') %]</a></li>
+        <li><a href ng-click="selectedHoldingsVolCopyAdd()">[% l('Call Numbers and Items') %]</a></li>
 
         <p><b>[% l('Edit') %]</b></p>    
-        <li><a href ng-click="selectedHoldingsVolEdit()">[% l('Volumes') %]</a></li>
+        <li><a href ng-click="selectedHoldingsVolEdit()">[% l('Call Numbers') %]</a></li>
         <li><a href ng-click="selectedHoldingsCopyEdit()">[% l('Items') %]</a></li>
-        <li><a href ng-click="selectedHoldingsVolCopyEdit()">[% l('Volumes and Items') %]</a></li>
+        <li><a href ng-click="selectedHoldingsVolCopyEdit()">[% l('Call Numbers and Items') %]</a></li>
         <li><a href ng-click="replaceBarcodes()">[% l('Replace Barcodes') %]</a></li>
 
         <p><b>[% l('Transfer') %]</b></p>    
         <li><a href ng-click="changeItemOwningLib()">[% l('Items to Previously Marked Library') %]</a></li>
-        <li><a href ng-click="transferItems()">[% l('Items to Previously Marked Volume') %]</a></li>
+        <li><a href ng-click="transferItems()">[% l('Items to Previously Marked Call Number') %]</a></li>
       </ul>
     </div>
     <div>
diff --git a/Open-ILS/src/templates/staff/cat/share/t_embedded_volcopy.tt2 b/Open-ILS/src/templates/staff/cat/share/t_embedded_volcopy.tt2
index 4c704d7..8e23779 100644
--- a/Open-ILS/src/templates/staff/cat/share/t_embedded_volcopy.tt2
+++ b/Open-ILS/src/templates/staff/cat/share/t_embedded_volcopy.tt2
@@ -2,7 +2,7 @@
   <div class="modal-header">
     <button type="button" class="close"
       ng-click="cancel()" aria-hidden="true">×</button>
-    <h4 class="modal-title">[% l('Edit volumes') %]</h4>
+    <h4 class="modal-title">[% l('Edit call numbers') %]</h4>
   </div>
   <div class="modal-body">
     <eg-embed-frame save-space="500" url="volcopy_url"></eg-embed-frame>
diff --git a/Open-ILS/src/templates/staff/cat/share/t_volume_list.tt2 b/Open-ILS/src/templates/staff/cat/share/t_volume_list.tt2
index 6cb5692..041204c 100644
--- a/Open-ILS/src/templates/staff/cat/share/t_volume_list.tt2
+++ b/Open-ILS/src/templates/staff/cat/share/t_volume_list.tt2
@@ -5,8 +5,8 @@
     grid-controls="holdingsGridControls"
     persist-key="cat.record_overlay.holdings">
 
-    <eg-grid-menu-item handler="edit_volumes" label="[% l('Edit volumes') %]" ng-if="editVolumes"></eg-grid-menu-item>
-    <eg-grid-menu-item handler="edit_copies" label="[% l('Edit volumes and items') %]" ng-if="editCopies"></eg-grid-menu-item>
+    <eg-grid-menu-item handler="edit_volumes" label="[% l('Edit call numbers') %]" ng-if="editVolumes"></eg-grid-menu-item>
+    <eg-grid-menu-item handler="edit_copies" label="[% l('Edit call numbers and items') %]" ng-if="editCopies"></eg-grid-menu-item>
 
     <eg-grid-field label="[% l('Owning Library') %]" path="owner_label" flex="4" align="right" visible></eg-grid-field>
     <eg-grid-field label="[% l('Call Number') %]"    path="call_number.label" visible></eg-grid-field>
diff --git a/Open-ILS/src/templates/staff/cat/volcopy/index.tt2 b/Open-ILS/src/templates/staff/cat/volcopy/index.tt2
index dc370dc..385c904 100644
--- a/Open-ILS/src/templates/staff/cat/volcopy/index.tt2
+++ b/Open-ILS/src/templates/staff/cat/volcopy/index.tt2
@@ -1,6 +1,6 @@
 [%
   WRAPPER "staff/base.tt2";
-  ctx.page_title = l("Volume/Item Editor"); 
+  ctx.page_title = l("Holdings Editor"); 
   ctx.page_app = "egVolCopy";
 %]
 
@@ -13,8 +13,8 @@
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/cat/services/record.js"></script>
 <script>
 angular.module('egCoreMod').run(['egStrings', function(s) {
-    s.VOL_COPY_TEMPLATE_SUCCESS_SAVE = "[% l('Saved volume/copy template(s)') %]";
-    s.VOL_COPY_TEMPLATE_SUCCESS_DELETE = "[% l('Deleted volume/copy template') %]";
+    s.VOL_COPY_TEMPLATE_SUCCESS_SAVE = "[% l('Saved holdings template(s)') %]";
+    s.VOL_COPY_TEMPLATE_SUCCESS_DELETE = "[% l('Deleted holdings template') %]";
     [%# Note the "~" characters escape the gettext brackets %]
     s.COPY_NOTE_INITIALS = 
       "[% l('[_1] ~[ [_2] @ [_3] ~]', '{{value}}', '{{initials}}', '{{ws_ou}}') %]"
diff --git a/Open-ILS/src/templates/staff/cat/volcopy/t_attr_edit.tt2 b/Open-ILS/src/templates/staff/cat/volcopy/t_attr_edit.tt2
index eef5c34..ffbaeba 100644
--- a/Open-ILS/src/templates/staff/cat/volcopy/t_attr_edit.tt2
+++ b/Open-ILS/src/templates/staff/cat/volcopy/t_attr_edit.tt2
@@ -48,7 +48,7 @@
     <div class="row pad-vert" ng-if="template_controls && defaults.show_vol_template_controls">
         <div class="row">
             <div class="col-xs-12">
-                <h4 class="center-block">[% l('Volume Attributes') %]</h4>
+                <h4 class="center-block">[% l('Call Number Attributes') %]</h4>
             </div>
         </div>
     </div>
diff --git a/Open-ILS/src/templates/staff/cat/volcopy/t_defaults.tt2 b/Open-ILS/src/templates/staff/cat/volcopy/t_defaults.tt2
index 928174e..e4b79c5 100644
--- a/Open-ILS/src/templates/staff/cat/volcopy/t_defaults.tt2
+++ b/Open-ILS/src/templates/staff/cat/volcopy/t_defaults.tt2
@@ -3,14 +3,14 @@
         <div class="col-md-3">
             <div class="row">
                 <div class="col-xs-12">
-                    <h4>[% l('Volume/Item Detail defaults') %]</h4>
+                    <h4>[% l('Holdings Detail defaults') %]</h4>
                 </div>
             </div>
             <div class="row">
                 <div class="col-xs-12">
                     <label>
                         <input type="checkbox" ng-change="saveDefaults()" ng-model="defaults.always_volumes"/>
-                        [% l('Always display Volume/Item Detail pane') %]
+                        [% l('Always display Holdings Detail pane') %]
                     </label>
                 </div>
             </div>
diff --git a/Open-ILS/src/templates/staff/cat/volcopy/t_edit.tt2 b/Open-ILS/src/templates/staff/cat/volcopy/t_edit.tt2
index 27a0aed..c3fb82b 100644
--- a/Open-ILS/src/templates/staff/cat/volcopy/t_edit.tt2
+++ b/Open-ILS/src/templates/staff/cat/volcopy/t_edit.tt2
@@ -4,8 +4,8 @@
     <script>window.empty_label_string = "[% l('Missing Call Number') %]";</script>
     <div ng-show="!only_vols" class="btn-group">
         <label class="btn btn-default" ng-click="show_vols = !show_vols">
-            <span ng-show="show_vols" style="padding-right: 5px;">[% l('Hide Volume/Item Details') %]</span>
-            <span ng-hide="show_vols" style="padding-right: 5px;">[% l('Show Volume/Item Details') %]</span>
+            <span ng-show="show_vols" style="padding-right: 5px;">[% l('Hide Holdings Details') %]</span>
+            <span ng-hide="show_vols" style="padding-right: 5px;">[% l('Show Holdings Details') %]</span>
         </label>
         <label class="btn btn-default" ng-click="show_copies = !show_copies">
             <span ng-show="show_copies" style="padding-right: 5px;">[% l('Hide Item Attributes') %]</span>
@@ -39,12 +39,12 @@
         </div>
         <div class="row pad-vert">
             <div class="col-xs-1"><b>[% l('Owning Library') %]</b></div>
-            <div class="col-xs-1"><b>[% l('Volumes') %]</b></div>
+            <div class="col-xs-1"><b>[% l('Call Numbers') %]</b></div>
             <div class="col-xs-10">
                 <div class="row">
                     <div class="col-xs-2"><b>[% l('Classification') %]</b></div>
                     <div class="col-xs-1"><b>[% l('Prefix') %]</b></div>
-                    <div class="col-xs-2"><b>[% l('Call Number') %]</b></div>
+                    <div class="col-xs-2"><b>[% l('Call Number Label') %]</b></div>
                     <div class="col-xs-1"><b>[% l('Suffix') %]</b></div>
                     <div class="col-xs-1" ng-hide="only_vols"><b>[% l('Items') %]</b></div>
                     <div class="col-xs-5" ng-hide="only_vols">
@@ -76,7 +76,7 @@
         <hr/>
         <div>
             <eg-org-selector alldisabled="{{record_id == 0}}" selected="new_lib_to_add" onchange="changeNewLib" disable-test="cant_have_vols"></eg-org-selector>
-            <button class="btn btn-default" ng-click="addLibToStruct()" type="button">[% l('Add volume') %]</button>
+            <button class="btn btn-default" ng-click="addLibToStruct()" type="button">[% l('Add call number') %]</button>
         </div>
     </div>
 
diff --git a/Open-ILS/src/templates/staff/cat/volcopy/t_view.tt2 b/Open-ILS/src/templates/staff/cat/volcopy/t_view.tt2
index 0226696..c009569 100644
--- a/Open-ILS/src/templates/staff/cat/volcopy/t_view.tt2
+++ b/Open-ILS/src/templates/staff/cat/volcopy/t_view.tt2
@@ -42,7 +42,7 @@ eg-navbar {
 
 <div ng-if="edit_templates">
   <div class="row">
-    <h2>[% l("Edit Volume/Item Templates") %]</h2>
+    <h2>[% l("Edit Holdings Templates") %]</h2>
   </div>
   <div class="row">
     <eg-vol-template edit-templates="edit_templates"></eg-vol-template>
diff --git a/Open-ILS/src/templates/staff/circ/checkin/t_checkin_table.tt2 b/Open-ILS/src/templates/staff/circ/checkin/t_checkin_table.tt2
index 716e408..eff1448 100644
--- a/Open-ILS/src/templates/staff/circ/checkin/t_checkin_table.tt2
+++ b/Open-ILS/src/templates/staff/circ/checkin/t_checkin_table.tt2
@@ -50,7 +50,7 @@
 
   <!-- Edit Group -->
   <eg-grid-action handler="selectedHoldingsVolCopyEdit" group="[% l('Edit') %]"
-    label="[% l('Volumes and Items') %]">
+    label="[% l('Holdings') %]">
   </eg-grid-action>
 
   <eg-grid-action handler="printSpineLabels" group="[% l('Print') %]"
diff --git a/Open-ILS/src/templates/staff/circ/holds/t_pull_list.tt2 b/Open-ILS/src/templates/staff/circ/holds/t_pull_list.tt2
index 54e6362..4bd3762 100644
--- a/Open-ILS/src/templates/staff/circ/holds/t_pull_list.tt2
+++ b/Open-ILS/src/templates/staff/circ/holds/t_pull_list.tt2
@@ -53,7 +53,7 @@
   <eg-grid-action handler="grid_actions.cancel_hold"
     label="[% l('Cancel Hold') %]"></eg-grid-action>
 
-  <!-- Define the column using the sort-able copy location order
+  <!-- Define the column using the sort-able shelving location order
        position, but display the location label in each cell -->
   <eg-grid-field name="copy_location_order_position" required 
     path="current_copy.location.name" label="[% l('Shelving Location') %]">
diff --git a/Open-ILS/src/templates/staff/circ/share/t_hold_details.tt2 b/Open-ILS/src/templates/staff/circ/share/t_hold_details.tt2
index 56e67f5..ab2b752 100644
--- a/Open-ILS/src/templates/staff/circ/share/t_hold_details.tt2
+++ b/Open-ILS/src/templates/staff/circ/share/t_hold_details.tt2
@@ -31,7 +31,7 @@
 <div class="flex-row">
   <div class="flex-cell">[% l('Current Shelf Lib') %]</div>
   <div class="flex-cell well">{{hold.current_shelf_lib().shortname()}}</div>
-  <div class="flex-cell">[% l('Current Copy Location') %]</div>
+  <div class="flex-cell">[% l('Current Shelving Location') %]</div>
   <div class="flex-cell well">{{hold.current_copy().location().name()}}</div>
   <div class="flex-cell">[% l('Force Item Quality') %]</div>
   <div class="flex-cell well">{{hold.mint_condition() == 't'}}</div>
diff --git a/Open-ILS/src/templates/staff/circ/transits/t_list.tt2 b/Open-ILS/src/templates/staff/circ/transits/t_list.tt2
index f4507bb..425cd2f 100644
--- a/Open-ILS/src/templates/staff/circ/transits/t_list.tt2
+++ b/Open-ILS/src/templates/staff/circ/transits/t_list.tt2
@@ -51,7 +51,7 @@
     <a target="_self" href="./cat/item/{{item['target_copy.id']}}">{{item['target_copy.barcode']}}</a>
   </eg-grid-field>
   <eg-grid-field path='target_copy.circ_lib.shortname' hidden></eg-grid-field>
-  <eg-grid-field path='target_copy.location.name' label="[% l('Copy Location') %]" hidden sortable></eg-grid-field>
+  <eg-grid-field path='target_copy.location.name' label="[% l('Shelving Location') %]" hidden sortable></eg-grid-field>
   <eg-grid-field label="[% l('CN Prefix') %]" path="target_copy.call_number.prefix.label"></eg-grid-field>
   <eg-grid-field path='target_copy.call_number.label' hidden sortable></eg-grid-field>
   <eg-grid-field label="[% l('CN Suffix') %]" path="target_copy.call_number.suffix.label"></eg-grid-field>
diff --git a/Open-ILS/src/templates/staff/css/cat.css.tt2 b/Open-ILS/src/templates/staff/css/cat.css.tt2
index 0b8f4ed..9af6bd7 100644
--- a/Open-ILS/src/templates/staff/css/cat.css.tt2
+++ b/Open-ILS/src/templates/staff/css/cat.css.tt2
@@ -190,7 +190,7 @@ grid[name="-none-"] * label { color: black; }
 }
 
 /*
- * Volume / Item Editor Styles
+ * Holdings Editor Styles
  * /
 
 /* Wrapping in bootstrap style can separate radio buttons from their labels. */
diff --git a/Open-ILS/src/templates/staff/serials/t_batch_receive.tt2 b/Open-ILS/src/templates/staff/serials/t_batch_receive.tt2
index cec2820..00eddac 100644
--- a/Open-ILS/src/templates/staff/serials/t_batch_receive.tt2
+++ b/Open-ILS/src/templates/staff/serials/t_batch_receive.tt2
@@ -45,7 +45,7 @@
       <b>[% l('Issuance') %]</b>
     </div>
     <div class="col-md-1">
-      <b>[% l('Copy location') %]</b>
+      <b>[% l('Shelving location') %]</b>
     </div>
     <div class="col-md-1">
       <b>[% l('Call number') %]</b>
diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd
index 098d075..ef72fec 100644
--- a/Open-ILS/web/opac/locale/en-US/lang.dtd
+++ b/Open-ILS/web/opac/locale/en-US/lang.dtd
@@ -2179,8 +2179,8 @@
 <!ENTITY staff.server.admin.closed_dates.date_span.invalid "Ending date is earlier than starting date">
 <!ENTITY staff.server.admin.closed_dates.success "Closed date successfully updated">
 <!ENTITY staff.server.admin.copy_locations.title "Evergreen: Copy Locations Editor">
-<!ENTITY staff.server.admin.copy_locations.editor " Copy Locations Editor ">
-<!ENTITY staff.server.admin.copy_locations.editor.create "Create a new copy location">
+<!ENTITY staff.server.admin.copy_locations.editor " Shelving Locations Editor ">
+<!ENTITY staff.server.admin.copy_locations.editor.create "Create a new shelving location">
 <!ENTITY staff.server.admin.copy_locations.editor.name "Name: ">
 <!ENTITY staff.server.admin.copy_locations.editor.holdable.label "Holdable: ">
 <!ENTITY staff.server.admin.copy_locations.editor.hold_verify.label "Hold Verify: ">

commit 5d28b84c87d11cac205ec3b74f758e8824d77536
Author: Kathy Lussier <klussier at masslnc.org>
Date:   Wed Aug 1 13:14:32 2018 -0400

    LP#1538691: Use items instead of copies
    
    For better consistency for the terms used in the client, let's use items instead
    of copies, which was the preference of most people who provided feedback on bug
    1538691.
    
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
    
    Conflicts:
            Open-ILS/src/templates/staff/cat/catalog/t_holds.tt2
            Open-ILS/src/templates/staff/cat/item/t_list.tt2
            Open-ILS/src/templates/staff/cat/item/t_summary_pane.tt2
            Open-ILS/src/templates/staff/circ/holds/t_shelf_list.tt2
    
    Signed-off-by: Dan Wells <dbw2 at calvin.edu>

diff --git a/Open-ILS/src/templates/staff/admin/local/asset/copy_tag.tt2 b/Open-ILS/src/templates/staff/admin/local/asset/copy_tag.tt2
index 82d93bc..d17d6dc 100644
--- a/Open-ILS/src/templates/staff/admin/local/asset/copy_tag.tt2
+++ b/Open-ILS/src/templates/staff/admin/local/asset/copy_tag.tt2
@@ -1,6 +1,6 @@
 [%
   WRAPPER "staff/base.tt2";
-  ctx.page_title = l("Copy Tags");
+  ctx.page_title = l("Item Tags");
   ctx.page_app = "egAdminConfig";
   ctx.page_ctrl = 'CopyTag';
 %]
@@ -15,7 +15,7 @@
 
 <div class="container-fluid" style="text-align:center">
   <div class="alert alert-info alert-less-pad strong-text-2">
-    [% l('Copy Tags') %]
+    [% l('Item Tags') %]
   </div>
 </div>
 
diff --git a/Open-ILS/src/templates/staff/admin/local/autoGridEditor/acas.tt2 b/Open-ILS/src/templates/staff/admin/local/autoGridEditor/acas.tt2
index 7733249..2702366 100644
--- a/Open-ILS/src/templates/staff/admin/local/autoGridEditor/acas.tt2
+++ b/Open-ILS/src/templates/staff/admin/local/autoGridEditor/acas.tt2
@@ -1,12 +1,12 @@
-[% ctx.page_title = l("Copy Alert Suppression"); %]
+[% ctx.page_title = l("Item Alert Suppression"); %]
 <!-- use <form> so we get submit-on-enter for free -->
 <form class="form-validated" novalidate name="form" ng-submit="ok(record)">
   <div>
     <div class="modal-header">
       <button type="button" class="close" 
         ng-click="cancel()" aria-hidden="true">×</button>
-      <h4 ng-if="creating"  class="modal-title">[% l('Create copy alert suppression rule') %]</h4>
-      <h4 ng-if="!creating" class="modal-title">[% l('Update copy alert suppression rule') %]</h4>
+      <h4 ng-if="creating"  class="modal-title">[% l('Create item alert suppression rule') %]</h4>
+      <h4 ng-if="!creating" class="modal-title">[% l('Update item alert suppression rule') %]</h4>
     </div>
     <div class="modal-body">
       <div class="form-group">
diff --git a/Open-ILS/src/templates/staff/admin/local/autoGridEditor/ccat.tt2 b/Open-ILS/src/templates/staff/admin/local/autoGridEditor/ccat.tt2
index 6eb816d..4ca9b8b 100644
--- a/Open-ILS/src/templates/staff/admin/local/autoGridEditor/ccat.tt2
+++ b/Open-ILS/src/templates/staff/admin/local/autoGridEditor/ccat.tt2
@@ -1,12 +1,12 @@
-[% ctx.page_title = l("Copy Alert Types"); %]
+[% ctx.page_title = l("Item Alert Types"); %]
 <!-- use <form> so we get submit-on-enter for free -->
 <form class="form-validated" novalidate name="form" ng-submit="ok(record)">
   <div>
     <div class="modal-header">
       <button type="button" class="close" 
         ng-click="cancel()" aria-hidden="true">×</button>
-      <h4 ng-if="creating"  class="modal-title">[% l('Create copy alert type') %]</h4>
-      <h4 ng-if="!creating" class="modal-title">[% l('Update copy alert type') %]</h4>
+      <h4 ng-if="creating"  class="modal-title">[% l('Create item alert type') %]</h4>
+      <h4 ng-if="!creating" class="modal-title">[% l('Update item alert type') %]</h4>
     </div>
     <div class="modal-body">
       <div class="form-group">
diff --git a/Open-ILS/src/templates/staff/admin/local/t_splash.tt2 b/Open-ILS/src/templates/staff/admin/local/t_splash.tt2
index 90ec95a..7407a7b 100644
--- a/Open-ILS/src/templates/staff/admin/local/t_splash.tt2
+++ b/Open-ILS/src/templates/staff/admin/local/t_splash.tt2
@@ -17,12 +17,12 @@
     ,[ l('Circ Limit Sets'), "./admin/local/config/circ_limit_set" ]
     ,[ l('Circulation Policies'), "./admin/local/config/circ_matrix_matchpoint" ]
     ,[ l('Closed Dates Editor'), "./admin/local/actor/closed_dates" ]
-    ,[ l('Copy Alert Types'), "./admin/local/config/copy_alert_types" ]
-    ,[ l('Copy Alert Suppression'), "./admin/local/actor/copy_alert_suppress" ]
+    ,[ l('Item Alert Types'), "./admin/local/config/copy_alert_types" ]
+    ,[ l('Item Alert Suppression'), "./admin/local/actor/copy_alert_suppress" ]
     ,[ l('Copy Location Groups'), "./admin/local/asset/copy_location_group" ]
     ,[ l('Copy Location Order'), "./admin/local/asset/copy_location_order" ]
     ,[ l('Copy Locations Editor'), "./admin/local/asset/copy_locations" ]
-    ,[ l('Copy Tags'), "./admin/local/asset/copy_tag" ]
+    ,[ l('Item Tags'), "./admin/local/asset/copy_tag" ]
     ,[ l('Field Documentation'), "./admin/local/config/idl_field_doc" ]
     ,[ l('Group Penalty Thresholds'), "./admin/local/permission/grp_penalty_threshold" ]
     ,[ l('Hold Policies'), "./admin/local/config/hold_matrix_matchpoint" ]
@@ -37,7 +37,7 @@
     ,[ l('Statistical Popularity Badges'), "./admin/local/rating/badge" ]
     ,[ l('Surveys'), "./admin/local/action/survey" ]
     ,[ l('Transit List'), "./circ/transits/list" ]
-    ,[ l('Volume/Copy Template Editor'), "./cat/volcopy/edit_templates" ]
+    ,[ l('Volume/Item Template Editor'), "./cat/volcopy/edit_templates" ]
     ,[ l('Work Log'), "./admin/workstation/log" ]
    ];
 
diff --git a/Open-ILS/src/templates/staff/admin/serials/t_splash.tt2 b/Open-ILS/src/templates/staff/admin/serials/t_splash.tt2
index 308a31d..7477ed8 100644
--- a/Open-ILS/src/templates/staff/admin/serials/t_splash.tt2
+++ b/Open-ILS/src/templates/staff/admin/serials/t_splash.tt2
@@ -9,7 +9,7 @@
 
 [%
     interfaces = [
-     [ l('Serial Copy Templates'), "./admin/serials/templates" ]
+     [ l('Serial Item Templates'), "./admin/serials/templates" ]
      [ l('Prediction Pattern Templates'), "./admin/serials/pattern_template" ]
    ];
 
diff --git a/Open-ILS/src/templates/staff/admin/server/config/copy_tag_type.tt2 b/Open-ILS/src/templates/staff/admin/server/config/copy_tag_type.tt2
index 676083d..37d6c82 100644
--- a/Open-ILS/src/templates/staff/admin/server/config/copy_tag_type.tt2
+++ b/Open-ILS/src/templates/staff/admin/server/config/copy_tag_type.tt2
@@ -1,6 +1,6 @@
 [%
   WRAPPER "staff/base.tt2";
-  ctx.page_title = l("Copy Tag Types");
+  ctx.page_title = l("Item Tag Types");
   ctx.page_app = "egAdminConfig";
   ctx.page_ctrl = 'CopyTagType';
 %]
@@ -15,7 +15,7 @@
 
 <div class="container-fluid" style="text-align:center">
   <div class="alert alert-info alert-less-pad strong-text-2">
-    [% l('Copy Tag Types') %]
+    [% l('Item Tag Types') %]
   </div>
 </div>
 
diff --git a/Open-ILS/src/templates/staff/admin/server/t_splash.tt2 b/Open-ILS/src/templates/staff/admin/server/t_splash.tt2
index 44013fe..c03666f 100644
--- a/Open-ILS/src/templates/staff/admin/server/t_splash.tt2
+++ b/Open-ILS/src/templates/staff/admin/server/t_splash.tt2
@@ -26,8 +26,8 @@
     ,[ l('Circulation Max Fine Rules'), "./admin/server/config/rule_max_fine" ]
     ,[ l('Circulation Modifiers'), "./admin/server/config/circ_modifier" ]
     ,[ l('Circulation Recurring Fine Rules'), "./admin/server/config/rule_recurring_fine" ]
-    ,[ l('Copy Statuses'), "./admin/server/legacy/config/copy_status" ]
-    ,[ l('Copy Tag Types'), "./admin/server/config/copy_tag_type" ]
+    ,[ l('Item Statuses'), "./admin/server/legacy/config/copy_status" ]
+    ,[ l('Item Tag Types'), "./admin/server/config/copy_tag_type" ]
     ,[ l('Custom Org Unit Trees'), "./admin/server/actor/org_unit_custom_tree" ]
     ,[ l('Floating Groups'), "./admin/server/config/floating_groups" ]
     ,[ l('Global Flags'), "./admin/server/config/global_flag" ]
diff --git a/Open-ILS/src/templates/staff/admin/workstation/t_print_config.tt2 b/Open-ILS/src/templates/staff/admin/workstation/t_print_config.tt2
index 8cd6bf9..043a446 100644
--- a/Open-ILS/src/templates/staff/admin/workstation/t_print_config.tt2
+++ b/Open-ILS/src/templates/staff/admin/workstation/t_print_config.tt2
@@ -230,7 +230,7 @@
               <div class="row">
                 <div class="col-md-1"></div>
                 <div class="col-md-2">
-                  <label>[% l('Number of Copies') %]</label>
+                  <label>[% l('Number of Items') %]</label>
                 </div>
                 <div class="col-md-4">
                   <input type="text" size="4" class="form-control"
diff --git a/Open-ILS/src/templates/staff/cat/bucket/copy/index.tt2 b/Open-ILS/src/templates/staff/cat/bucket/copy/index.tt2
index bcc0366..35b2d30 100644
--- a/Open-ILS/src/templates/staff/cat/bucket/copy/index.tt2
+++ b/Open-ILS/src/templates/staff/cat/bucket/copy/index.tt2
@@ -1,6 +1,6 @@
 [%
   WRAPPER "staff/base.tt2";
-  ctx.page_title = l("Copy Buckets"); 
+  ctx.page_title = l("Item Buckets"); 
   ctx.page_app = "egCatCopyBuckets";
   ctx.page_ctrl = "CopyBucketCtrl";
 %]
@@ -38,7 +38,7 @@ changing routes with each tab selection anyway.
 <ul class="nav nav-tabs">
   <li ng-class="{active : tab == 'pending'}">
     <a href="./cat/bucket/copy/pending/{{bucketSvc.currentBucket.id()}}">
-        [% l('Pending Copies') %]
+        [% l('Pending Items') %]
         <span ng-cloak>({{bucketSvc.pendingList.length}})</span>
     </a>
   </li>
diff --git a/Open-ILS/src/templates/staff/cat/bucket/copy/t_apply_tags.tt2 b/Open-ILS/src/templates/staff/cat/bucket/copy/t_apply_tags.tt2
index 64a6891..e218ade 100644
--- a/Open-ILS/src/templates/staff/cat/bucket/copy/t_apply_tags.tt2
+++ b/Open-ILS/src/templates/staff/cat/bucket/copy/t_apply_tags.tt2
@@ -2,7 +2,7 @@
     <div class="modal-header">
       <button type="button" class="close" ng-click="cancel()" 
         aria-hidden="true">×</button>
-      <h4 class="modal-title">[% l('Apply Copy Tags') %]</h4>
+      <h4 class="modal-title">[% l('Apply Item Tags') %]</h4>
     </div>
     <div class="modal-body">
       <ul>
diff --git a/Open-ILS/src/templates/staff/cat/bucket/copy/t_view.tt2 b/Open-ILS/src/templates/staff/cat/bucket/copy/t_view.tt2
index 99a3584..8f2bbe2 100644
--- a/Open-ILS/src/templates/staff/cat/bucket/copy/t_view.tt2
+++ b/Open-ILS/src/templates/staff/cat/bucket/copy/t_view.tt2
@@ -10,17 +10,17 @@
 
   [% INCLUDE 'staff/cat/bucket/copy/t_grid_menu.tt2' %]
 
-  <eg-grid-action label="[% l('Remove Selected Copies from Bucket') %]" group="[% l('Bucket') %]"
+  <eg-grid-action label="[% l('Remove Selected Items from Bucket') %]" group="[% l('Bucket') %]"
     handler="detachCopies"></eg-grid-action>
-  <eg-grid-action label="[% l('Request Selected Copies') %]" group="[% l('Items') %]"
+  <eg-grid-action label="[% l('Request Selected Items') %]" group="[% l('Items') %]"
     handler="requestItems"></eg-grid-action>
-  <eg-grid-action label="[% l('Edit Selected Copies') %]" group="[% l('Items') %]"
+  <eg-grid-action label="[% l('Edit Selected Items') %]" group="[% l('Items') %]"
     handler="spawnHoldingsEdit"></eg-grid-action>
   <eg-grid-action handler="print_labels" group="[% l('Show') %]"
     label="[% l('Print Labels') %]"></eg-grid-action>
-  <eg-grid-action label="[% l('Transfer Selected Copies to Marked Volume') %]" group="[% l('Items') %]"
+  <eg-grid-action label="[% l('Transfer Selected Items to Marked Volume') %]" group="[% l('Items') %]"
     handler="transferCopies"></eg-grid-action>
-  <eg-grid-action label="[% l('Delete Selected Copies from Catalog') %]" group="[% l('Items') %]"
+  <eg-grid-action label="[% l('Delete Selected Items from Catalog') %]" group="[% l('Items') %]"
     handler="deleteCopiesFromCatalog"></eg-grid-action>
   <eg-grid-action label="[% l('Apply Tags') %]" 
     handler="applyTags"></eg-grid-action>
diff --git a/Open-ILS/src/templates/staff/cat/catalog/index.tt2 b/Open-ILS/src/templates/staff/cat/catalog/index.tt2
index f2c75f7..ec76905 100644
--- a/Open-ILS/src/templates/staff/cat/catalog/index.tt2
+++ b/Open-ILS/src/templates/staff/cat/catalog/index.tt2
@@ -27,13 +27,13 @@
 <script>
   angular.module('egCoreMod').run(['egStrings', function(s) {
     s.CONFIRM_DELETE_COPIES_VOLUMES =
-      "[% l('Permanently delete selected copies and/or volumes from catalog?') %]";
+      "[% l('Permanently delete selected items and/or volumes from catalog?') %]";
     s.CONFIRM_DELETE_COPIES_VOLUMES_MESSAGE =
-      "[% l('Will delete {{copies}} copies and {{volumes}} volumes') %]";
+      "[% l('Will delete {{copies}} items and {{volumes}} volumes') %]";
     s.CONFIRM_DELETE_PEERS =
-      "[% l('Unlink selected conjoined copies?') %]";
+      "[% l('Unlink selected conjoined items?') %]";
     s.CONFIRM_DELETE_PEERS_MESSAGE =
-      "[% l('Will unlink {{peers}} copies') %]";
+      "[% l('Will unlink {{peers}} items') %]";
     s.CONFIRM_TRANSFER_COPIES_TO_MARKED_VOLUME =                                                                                                                  
       "[% l('Are you sure you want to transfer selected items to the marked volume?') %]";                                                                                   
     s.OVERRIDE_TRANSFER_COPIES_TO_MARKED_VOLUME_TITLE =                                                                                                           
diff --git a/Open-ILS/src/templates/staff/cat/catalog/t_catalog.tt2 b/Open-ILS/src/templates/staff/cat/catalog/t_catalog.tt2
index 5c2630e..500575b 100644
--- a/Open-ILS/src/templates/staff/cat/catalog/t_catalog.tt2
+++ b/Open-ILS/src/templates/staff/cat/catalog/t_catalog.tt2
@@ -24,7 +24,7 @@
   <div class="col-md-6">
     <div class="pull-right">
     <button type="button" class="btn btn-default" ng-click="selectedHoldingsVolCopyAdd()">
-        [% l('Add Copies') %]
+        [% l('Add Items') %]
     </button>
     <div class="btn-group" uib-dropdown dropdown-append-to-body>
         <button id="serials-button" type="button" class="btn btn-default" uib-dropdown-toggle>
diff --git a/Open-ILS/src/templates/staff/cat/catalog/t_conjoined_items.tt2 b/Open-ILS/src/templates/staff/cat/catalog/t_conjoined_items.tt2
index a4ad8c9..c360eff 100644
--- a/Open-ILS/src/templates/staff/cat/catalog/t_conjoined_items.tt2
+++ b/Open-ILS/src/templates/staff/cat/catalog/t_conjoined_items.tt2
@@ -17,7 +17,7 @@
     <eg-grid-menu-item handler="changeConjoinedType"
       label="[% l('Change Type') %]"/>
 
-    <eg-grid-field label="[% l('Copy') %]"  path="target_copy.barcode" visible>
+    <eg-grid-field label="[% l('Item') %]"  path="target_copy.barcode" visible>
       <a target="_self" href="[% ctx.base_path %]/staff/cat/item/{{item.target_copy().id()}}">
         {{item.target_copy().barcode()}}
       </a>
diff --git a/Open-ILS/src/templates/staff/cat/catalog/t_holdings.tt2 b/Open-ILS/src/templates/staff/cat/catalog/t_holdings.tt2
index 31192d4..8c41ea6 100644
--- a/Open-ILS/src/templates/staff/cat/catalog/t_holdings.tt2
+++ b/Open-ILS/src/templates/staff/cat/catalog/t_holdings.tt2
@@ -29,7 +29,7 @@
       checked="holdings_show_empty_org"/>
 
     <eg-grid-menu-item handler="holdings_checkbox_handler"
-      label="[% l('Show copy detail') %]"
+      label="[% l('Show Item detail') %]"
       checkbox="holdings_show_copies"
       checked="holdings_show_copies"/>
 
@@ -70,29 +70,29 @@
     <eg-grid-action handler="selectedHoldingsVolAdd" group="[% l('Add') %]"
       label="[% l('Volumes') %]"></eg-grid-action>
     <eg-grid-action handler="selectedHoldingsCopyAdd" group="[% l('Add') %]" disabled="vols_not_shown"
-      label="[% l('Copies') %]"></eg-grid-action>
+      label="[% l('Items') %]"></eg-grid-action>
     <eg-grid-action handler="selectedHoldingsVolCopyAdd" group="[% l('Add') %]"
-      label="[% l('Volumes and Copies') %]"></eg-grid-action>
+      label="[% l('Volumes and Items') %]"></eg-grid-action>
     <eg-grid-action handler="selectedHoldingsCopyAlertsAdd" group="[% l('Add') %]" disabled="vols_not_shown"
-      label="[% l('Copy Alerts') %]"></eg-grid-action>
+      label="[% l('Item Alerts') %]"></eg-grid-action>
 
     <eg-grid-action handler="selectedHoldingsVolEdit" group="[% l('Edit') %]"
       label="[% l('Volumes') %]"></eg-grid-action>
     <eg-grid-action handler="selectedHoldingsCopyEdit" group="[% l('Edit') %]"
-      label="[% l('Copies') %]"></eg-grid-action>
+      label="[% l('Items') %]"></eg-grid-action>
     <eg-grid-action handler="selectedHoldingsVolCopyEdit" group="[% l('Edit') %]"
-      label="[% l('Volumes and Copies') %]"></eg-grid-action>
+      label="[% l('Volumes and Items') %]"></eg-grid-action>
     <eg-grid-action handler="replaceBarcodes" group="[% l('Edit') %]"
       label="[% l('Replace Barcodes') %]"></eg-grid-action>
     <eg-grid-action handler="selectedHoldingsCopyAlertsManage" group="[% l('Edit') %]"
-      label="[% l('Manage Copy Alerts') %]"></eg-grid-action>
+      label="[% l('Manage Item Alerts') %]"></eg-grid-action>
 
     <eg-grid-action handler="selectedHoldingsEmptyVolCopyDelete" group="[% l('Delete') %]" disabled="vols_not_shown"
       label="[% l('Empty Volumes') %]"></eg-grid-action>
     <eg-grid-action handler="selectedHoldingsCopyDelete" group="[% l('Delete') %]" disabled="copies_not_shown"
-      label="[% l('Copies') %]"></eg-grid-action>
+      label="[% l('Items') %]"></eg-grid-action>
     <eg-grid-action handler="selectedHoldingsVolCopyDelete" group="[% l('Delete') %]" disabled="copies_not_shown"
-      label="[% l('Volumes and Copies') %]"></eg-grid-action>
+      label="[% l('Volumes and Items') %]"></eg-grid-action>
 
     <eg-grid-action handler="transferVolumes" group="[% l('Transfer') %]"
       label="[% l('Volumes to Previously Marked Destination') %]"></eg-grid-action>
@@ -103,7 +103,7 @@
     <eg-grid-field label="[% l('Owning Library') %]"  path="owner_label" flex="4" align="right" visible></eg-grid-field>
     <eg-grid-field label="[% l('Call Number') %]"     path="call_number.label" visible></eg-grid-field>
     <eg-grid-field label="[% l('Location') %]"        path="location.name" visible></eg-grid-field>
-    <eg-grid-field label="[% l('Copy #') %]"          path="copy_number" flex="1" visible></eg-grid-field>
+    <eg-grid-field label="[% l('Item #') %]"          path="copy_number" flex="1" visible></eg-grid-field>
     <eg-grid-field label="[% l('Barcode') %]"         path="barcode" visible></eg-grid-field>
     <eg-grid-field label="[% l('Status') %]"          path="status.name" flex="1" visible></eg-grid-field>
 
@@ -113,7 +113,7 @@
     <eg-grid-field label="[% l('Circulating Library') %]"    path="circ_lib.name"></eg-grid-field>
     <eg-grid-field label="[% l('Price') %]"                  path="price"></eg-grid-field>
     <eg-grid-field label="[% l('Circulation Modifier') %]"   path="circ_modifier"></eg-grid-field>
-    <eg-grid-field label="[% l('Copy ID') %]"                path="id"></eg-grid-field>
+    <eg-grid-field label="[% l('Item ID') %]"                path="id"></eg-grid-field>
     <eg-grid-field label="[% l('Circulate As MARC Type') %]" path="circ_as_type"></eg-grid-field>
     <eg-grid-field label="[% l('Circulate') %]"              datatype="bool" path="circulate"></eg-grid-field>
     <eg-grid-field label="[% l('Deposit?') %]"               datatype="bool" path="deposit"></eg-grid-field>
diff --git a/Open-ILS/src/templates/staff/cat/catalog/t_holds.tt2 b/Open-ILS/src/templates/staff/cat/catalog/t_holds.tt2
index 17fa5f0..263e2ae 100644
--- a/Open-ILS/src/templates/staff/cat/catalog/t_holds.tt2
+++ b/Open-ILS/src/templates/staff/cat/catalog/t_holds.tt2
@@ -25,12 +25,12 @@
 	<eg-grid-menu-item handler="transfer_holds_to_marked"
       label="[% l('Transfer All Title Holds') %]"></eg-grid-menu-item> -->
 
-    <eg-grid-action handler="grid_actions.show_recent_circs_wide" group="[% l('Copy') %]"
+    <eg-grid-action handler="grid_actions.show_recent_circs_wide" group="[% l('Item') %]"
       label="[% l('Show Last Few Circulations') %]"></eg-grid-action>
     <eg-grid-action handler="grid_actions.show_patrons_wide" group="[% l('Patron') %]"
       label="[% l('Retrieve Patron') %]"></eg-grid-action>
     <eg-grid-action group="[% l('Hold') %]" handler="grid_actions.set_copy_quality_wide"
-      label="[% l('Set Desired Copy Quality') %]"></eg-grid-action>
+      label="[% l('Set Desired Item Quality') %]"></eg-grid-action>
     <eg-grid-action group="[% l('Hold') %]" handler="grid_actions.edit_pickup_lib_wide"
       label="[% l('Edit Pickup Library') %]"></eg-grid-action>
     <eg-grid-action group="[% l('Hold') %]" handler="grid_actions.edit_notify_prefs_wide"
@@ -47,9 +47,9 @@
       label="[% l('Un-Set Top of Queue') %]"></eg-grid-action>
     <eg-grid-action handler="grid_actions.transfer_to_marked_title_wide" group="[% l('Hold') %]"
       label="[% l('Transfer To Marked Title') %]"></eg-grid-action>
-    <eg-grid-action handler="grid_actions.mark_damaged_wide" group="[% l('Copy') %]"
+    <eg-grid-action handler="grid_actions.mark_damaged_wide" group="[% l('Item') %]"
       label="[% l('Mark Item Damaged') %]"></eg-grid-action>
-    <eg-grid-action handler="grid_actions.mark_missing_wide" group="[% l('Copy') %]"
+    <eg-grid-action handler="grid_actions.mark_missing_wide" group="[% l('Item') %]"
       label="[% l('Mark Item Missing') %]"></eg-grid-action>
     <eg-grid-action handler="grid_actions.retarget_wide" group="[% l('Hold') %]"
       label="[% l('Find Another Target') %]"></eg-grid-action>
@@ -57,7 +57,7 @@
       label="[% l('Cancel Hold') %]"></eg-grid-action>
 
     <eg-grid-field label="[% l('Hold ID') %]" path='hold.id'></eg-grid-field>
-    <eg-grid-field label="[% l('Current Copy') %]" 
+    <eg-grid-field label="[% l('Current Item') %]" 
       path='hold.cp_barcode'>
       <a href="./cat/item/{{item.hold.cp_id}}/summary" target="_self">
         {{item.hold.cp_barcode}}
@@ -79,7 +79,7 @@
   </eg-grid-field>
 
   <eg-grid-field label="[% l('Author') %]" path='hold.author'></eg-grid-field>
-  <eg-grid-field label="[% l('Potential Copies') %]" path='hold.potentials'></eg-grid-field>
+  <eg-grid-field label="[% l('Potential Items') %]" path='hold.potentials'></eg-grid-field>
   <eg-grid-field label="[% l('Status') %]" path='status_string'></eg-grid-field>
 
   <eg-grid-field label="[% l('Queue Position') %]" path='hold.relative_queue_position' hidden></eg-grid-field>
@@ -91,7 +91,7 @@
     <eg-grid-field path='hold.rusr_id' label="[% l('Requestor ID') %]" hidden></eg-grid-field>
     <eg-grid-field path='hold.rusr_usrname' label="[% l('Requestor Username') %]" hidden></eg-grid-field>
 
-   <eg-grid-field label="[% l('Copy Status') %]" path="hold.cs_name" hidden></eg-grid-field>
+   <eg-grid-field label="[% l('Item Status') %]" path="hold.cs_name" hidden></eg-grid-field>
 
     <eg-grid-field path='hold.acnp_label' label="[% l('CN Prefix') %]" hidden></eg-grid-field>
     <eg-grid-field path='hold.acns_label' label="[% l('CN Suffix') %]" hidden></eg-grid-field>
diff --git a/Open-ILS/src/templates/staff/cat/item/t_list.tt2 b/Open-ILS/src/templates/staff/cat/item/t_list.tt2
index 361c997..7f67e46 100644
--- a/Open-ILS/src/templates/staff/cat/item/t_list.tt2
+++ b/Open-ILS/src/templates/staff/cat/item/t_list.tt2
@@ -49,25 +49,25 @@
   <eg-grid-action handler="selectedHoldingsCopyAdd" group="[% l('Add') %]"
     label="[% l('Items') %]"></eg-grid-action>
   <eg-grid-action handler="selectedHoldingsVolCopyAdd" group="[% l('Add') %]"
-    label="[% l('Volumes and Items') %]"></eg-grid-action>
+    label="[% l('Call Numbers and Items') %]"></eg-grid-action>
   <eg-grid-action handler="selectedHoldingsCopyAlertsAdd" group="[% l('Add') %]"
-    label="[% l('Copy Alerts') %]"></eg-grid-action>
+    label="[% l('Item Alerts') %]"></eg-grid-action>
 
   <eg-grid-action handler="selectedHoldingsVolEdit" group="[% l('Edit') %]"
-    label="[% l('Volumes') %]"></eg-grid-action>
+    label="[% l('Call Numbers') %]"></eg-grid-action>
   <eg-grid-action handler="selectedHoldingsCopyEdit" group="[% l('Edit') %]"
     label="[% l('Items') %]"></eg-grid-action>
   <eg-grid-action handler="selectedHoldingsVolCopyEdit" group="[% l('Edit') %]"
-    label="[% l('Volumes and Items') %]"></eg-grid-action>
+    label="[% l('Call Numbers and Items') %]"></eg-grid-action>
   <eg-grid-action handler="replaceBarcodes" group="[% l('Edit') %]"
     label="[% l('Replace Barcodes') %]"></eg-grid-action>
   <eg-grid-action handler="selectedHoldingsCopyAlertsEdit" group="[% l('Edit') %]"
-    label="[% l('Manage Copy Alerts') %]"></eg-grid-action>
+    label="[% l('Manage Item Alerts') %]"></eg-grid-action>
 
   <eg-grid-action handler="changeItemOwningLib" group="[% l('Transfer') %]"
     label="[% l('Items to Previously Marked Library') %]"></eg-grid-action>
   <eg-grid-action handler="transferItems" group="[% l('Transfer') %]"
-    label="[% l('Items to Previously Marked Volume') %]"></eg-grid-action>
+    label="[% l('Items to Previously Marked Call Number') %]"></eg-grid-action>
 
   <eg-grid-field label="[% l('Alert Message') %]"  path='alert_message' visible></eg-grid-field>
   <eg-grid-field label="[% l('Barcode') %]"        path='barcode' visible></eg-grid-field>
@@ -75,7 +75,7 @@
   <eg-grid-field label="[% l('Due Date') %]"       path="_circ.due_date" datecontext="_circ_lib" dateonlyinterval="_duration" datatype="timestamp" visible></eg-grid-field>
 
   <eg-grid-field label="[% l('Location') %]"       path="location.name" visible></eg-grid-field>
-  <eg-grid-field label="[% l('Copy Status') %]"    path="status.name" visible></eg-grid-field>
+  <eg-grid-field label="[% l('Item Status') %]"    path="status.name" visible></eg-grid-field>
   <eg-grid-field label="[% l('Title') %]"       
     path="call_number.record.simple_record.title" visible>
     <a target="_blank" href="[% ctx.base_path %]/staff/cat/catalog/record/{{item['call_number.record.id']}}">
@@ -102,8 +102,8 @@
   <eg-grid-field label="[% l('Circulate?') %]"            path="circulate" hidden></eg-grid-field>
   <eg-grid-field label="[% l('Circulation Library') %]"   path="circ_lib.shortname" hidden></eg-grid-field>
   <eg-grid-field label="[% l('Circulation Modifier') %]"  path="circ_modifier.name" hidden></eg-grid-field>
-  <eg-grid-field label="[% l('Copy ID') %]"               path="id" hidden></eg-grid-field>
-  <eg-grid-field label="[% l('Copy Number') %]"           path="copy_number" hidden></eg-grid-field>
+  <eg-grid-field label="[% l('Item ID') %]"               path="id" hidden></eg-grid-field>
+  <eg-grid-field label="[% l('Item Number') %]"           path="copy_number" hidden></eg-grid-field>
 
   <eg-grid-field label="[% l('Created By') %]"
     path="creator" hidden>
diff --git a/Open-ILS/src/templates/staff/cat/item/t_summary_pane.tt2 b/Open-ILS/src/templates/staff/cat/item/t_summary_pane.tt2
index 60797a7..dad5ec9 100644
--- a/Open-ILS/src/templates/staff/cat/item/t_summary_pane.tt2
+++ b/Open-ILS/src/templates/staff/cat/item/t_summary_pane.tt2
@@ -41,7 +41,7 @@
 	<div class="flex-cell">[% l('Acquisition Cost') %]</div>
     <div class="flex-cell well">{{copy.cost()}}</div>
 
-    <div class="flex-cell">[% l('Copy Location') %]</div>
+    <div class="flex-cell">[% l('Shelving Location') %]</div>
     <div
       class="flex-cell well"
       title="[% l('Holdable') %]: {{copy.location().holdable() | boolText}} / [% l('OPAC Visible') %]: {{copy.location().opac_visible() | boolText}}"
@@ -126,7 +126,7 @@
   </div>
 
   <div class="flex-row">
-    <div class="flex-cell">[% l('Copy ID') %]</div>
+    <div class="flex-cell">[% l('Item ID') %]</div>
     <div class="flex-cell well">{{copy.id()}}</div>
 
     <div class="flex-cell">[% l('Holdable') %]</div>
@@ -190,7 +190,7 @@
   </div>
 
   <div class="flex-row">
-    <div class="flex-cell">[% l('Copy Alerts') %]</div>
+    <div class="flex-cell">[% l('Item Alerts') %]</div>
     <div class="flex-cell" id="item-status-alert-msg">
       <button class="btn btn-default" ng-click="addCopyAlerts(copy.id())" >[% l('Add') %]</button>
       <button class="btn btn-default" ng-disabled="!copy_alert_count" ng-click="manageCopyAlerts(copy.id())" >[% l('Manage') %]</button>
diff --git a/Open-ILS/src/templates/staff/cat/share/t_marcedit.tt2 b/Open-ILS/src/templates/staff/cat/share/t_marcedit.tt2
index dc6b11d..d6b7f2a 100644
--- a/Open-ILS/src/templates/staff/cat/share/t_marcedit.tt2
+++ b/Open-ILS/src/templates/staff/cat/share/t_marcedit.tt2
@@ -161,8 +161,8 @@
           </div>
           <div class="col-md-4">
             <ul>
-               <li>[% l('Copy Current Row Above: CTRL+Up') %]</li>
-               <li>[% l('Copy Current Row Below: CTRL+Down') %]</li>
+               <li>[% l('Item Current Row Above: CTRL+Up') %]</li>
+               <li>[% l('Item Current Row Below: CTRL+Down') %]</li>
                <li>[% l('Add Subfield: CTRL+D or CTRL+I') %]</li>
                <li>[% l('Remove Row: CTRL+Del') %]</li>
             </ul>
diff --git a/Open-ILS/src/templates/staff/cat/share/t_replace_barcode.tt2 b/Open-ILS/src/templates/staff/cat/share/t_replace_barcode.tt2
index 83702a3..f15a831 100644
--- a/Open-ILS/src/templates/staff/cat/share/t_replace_barcode.tt2
+++ b/Open-ILS/src/templates/staff/cat/share/t_replace_barcode.tt2
@@ -31,10 +31,10 @@
 <div class="row pad-vert">
   <div class="col-md-6">
     <div class="alert alert-danger" ng-if="copyNotFound">
-      [% l('Copy Not Found') %]
+      [% l('Item Not Found') %]
     </div>
     <div class="alert alert-success" ng-if="updateOK">
-      <span>[% l('Copy Updated') %]</span>
+      <span>[% l('Item Updated') %]</span>
       <span class="horiz-pad" ng-if="copyId">
         <a href="./cat/item/{{copyId}}/summary" target="_self">
           [% l('View Item Details') %]
diff --git a/Open-ILS/src/templates/staff/cat/share/t_volume_list.tt2 b/Open-ILS/src/templates/staff/cat/share/t_volume_list.tt2
index 1c029e0..6cb5692 100644
--- a/Open-ILS/src/templates/staff/cat/share/t_volume_list.tt2
+++ b/Open-ILS/src/templates/staff/cat/share/t_volume_list.tt2
@@ -6,10 +6,10 @@
     persist-key="cat.record_overlay.holdings">
 
     <eg-grid-menu-item handler="edit_volumes" label="[% l('Edit volumes') %]" ng-if="editVolumes"></eg-grid-menu-item>
-    <eg-grid-menu-item handler="edit_copies" label="[% l('Edit volumes and copies') %]" ng-if="editCopies"></eg-grid-menu-item>
+    <eg-grid-menu-item handler="edit_copies" label="[% l('Edit volumes and items') %]" ng-if="editCopies"></eg-grid-menu-item>
 
     <eg-grid-field label="[% l('Owning Library') %]" path="owner_label" flex="4" align="right" visible></eg-grid-field>
     <eg-grid-field label="[% l('Call Number') %]"    path="call_number.label" visible></eg-grid-field>
-    <eg-grid-field label="[% l('# Copies') %]"       path="copy_count" visible></eg-grid-field>
+    <eg-grid-field label="[% l('# Items') %]"       path="copy_count" visible></eg-grid-field>
 
 </eg-grid>
diff --git a/Open-ILS/src/templates/staff/cat/volcopy/index.tt2 b/Open-ILS/src/templates/staff/cat/volcopy/index.tt2
index f93cb56..dc370dc 100644
--- a/Open-ILS/src/templates/staff/cat/volcopy/index.tt2
+++ b/Open-ILS/src/templates/staff/cat/volcopy/index.tt2
@@ -1,6 +1,6 @@
 [%
   WRAPPER "staff/base.tt2";
-  ctx.page_title = l("Volume/Copy Editor"); 
+  ctx.page_title = l("Volume/Item Editor"); 
   ctx.page_app = "egVolCopy";
 %]
 
diff --git a/Open-ILS/src/templates/staff/cat/volcopy/t_attr_edit.tt2 b/Open-ILS/src/templates/staff/cat/volcopy/t_attr_edit.tt2
index 9fe2a28..eef5c34 100644
--- a/Open-ILS/src/templates/staff/cat/volcopy/t_attr_edit.tt2
+++ b/Open-ILS/src/templates/staff/cat/volcopy/t_attr_edit.tt2
@@ -83,7 +83,7 @@
     <div class="row pad-vert" ng-if="template_controls && defaults.show_vol_template_controls">
         <div class="row">
             <div class="col-xs-12">
-                <h4 class="center-block">[% l('Copy Attributes') %]</h4>
+                <h4 class="center-block">[% l('Item Attributes') %]</h4>
             </div>
         </div>
     </div>
@@ -382,14 +382,14 @@
                       ng-disabled="!defaults.copy_notes"
                       ng-click="copy_notes_dialog(workingGridControls.selectedItems())"
                       type="button">
-                        [% l('Copy Notes') %]
+                        [% l('Item Notes') %]
                     </button>
                     <button
                       class="btn btn-default"
                       ng-disabled="!defaults.attributes.alerts"
                       ng-click="copy_alerts_dialog(workingGridControls.selectedItems())"
                       type="button">
-                        [% l('Copy Alerts') %]
+                        [% l('Item Alerts') %]
                     </button>
                 </div>
             </div>
@@ -416,7 +416,7 @@
                       ng-disabled="!defaults.copy_tags"
                       ng-click="copy_tags_dialog(workingGridControls.selectedItems())"
                       type="button">
-                        [% l('Copy Tags') %]
+                        [% l('Item Tags') %]
                     </button>
                 </div>
             </div>
diff --git a/Open-ILS/src/templates/staff/cat/volcopy/t_copy_alerts.tt2 b/Open-ILS/src/templates/staff/cat/volcopy/t_copy_alerts.tt2
index 3095d51..f602ae9 100644
--- a/Open-ILS/src/templates/staff/cat/volcopy/t_copy_alerts.tt2
+++ b/Open-ILS/src/templates/staff/cat/volcopy/t_copy_alerts.tt2
@@ -2,7 +2,7 @@
     <div class="modal-header">
       <button type="button" class="close" ng-click="cancel()" 
         aria-hidden="true">×</button>
-      <h4 class="modal-title">[% l('New Copy Alert') %]</h4>
+      <h4 class="modal-title">[% l('New Item Alert') %]</h4>
     </div>
     <div class="modal-body">
       <div class="row">
@@ -45,7 +45,7 @@
           </div>
           <div class="row">
             <div class="col-md-12">
-              <h4 class="pull-left">[% l('Existing Copy Alerts') %]</h4>
+              <h4 class="pull-left">[% l('Existing Item Alerts') %]</h4>
             </div>
           </div>
         </div>
diff --git a/Open-ILS/src/templates/staff/cat/volcopy/t_copy_notes.tt2 b/Open-ILS/src/templates/staff/cat/volcopy/t_copy_notes.tt2
index 671b3e9..007dbcc 100644
--- a/Open-ILS/src/templates/staff/cat/volcopy/t_copy_notes.tt2
+++ b/Open-ILS/src/templates/staff/cat/volcopy/t_copy_notes.tt2
@@ -2,7 +2,7 @@
     <div class="modal-header">
       <button type="button" class="close" ng-click="cancel()" 
         aria-hidden="true">×</button>
-      <h4 class="modal-title">[% l('New Copy Note') %]</h4>
+      <h4 class="modal-title">[% l('New Item Note') %]</h4>
     </div>
     <div class="modal-body">
       <div class="row">
@@ -46,7 +46,7 @@
           </div>
           <div class="row">
             <div class="col-md-12">
-              <h4 class="pull-left">[% l('Existing Copy Notes') %]</h4>
+              <h4 class="pull-left">[% l('Existing Item Notes') %]</h4>
             </div>
           </div>
         </div>
diff --git a/Open-ILS/src/templates/staff/cat/volcopy/t_copy_tags.tt2 b/Open-ILS/src/templates/staff/cat/volcopy/t_copy_tags.tt2
index 773f5db..13194cb 100644
--- a/Open-ILS/src/templates/staff/cat/volcopy/t_copy_tags.tt2
+++ b/Open-ILS/src/templates/staff/cat/volcopy/t_copy_tags.tt2
@@ -2,7 +2,7 @@
     <div class="modal-header">
       <button type="button" class="close" ng-click="cancel()" 
         aria-hidden="true">×</button>
-      <h4 class="modal-title">[% l('Manage Copy Tags') %]</h4>
+      <h4 class="modal-title">[% l('Manage Item Tags') %]</h4>
     </div>
     <div class="modal-body">
       <ul>
diff --git a/Open-ILS/src/templates/staff/cat/volcopy/t_defaults.tt2 b/Open-ILS/src/templates/staff/cat/volcopy/t_defaults.tt2
index 9430b6c..928174e 100644
--- a/Open-ILS/src/templates/staff/cat/volcopy/t_defaults.tt2
+++ b/Open-ILS/src/templates/staff/cat/volcopy/t_defaults.tt2
@@ -3,14 +3,14 @@
         <div class="col-md-3">
             <div class="row">
                 <div class="col-xs-12">
-                    <h4>[% l('Volume/Copy Detail defaults') %]</h4>
+                    <h4>[% l('Volume/Item Detail defaults') %]</h4>
                 </div>
             </div>
             <div class="row">
                 <div class="col-xs-12">
                     <label>
                         <input type="checkbox" ng-change="saveDefaults()" ng-model="defaults.always_volumes"/>
-                        [% l('Always display Volume/Copy Detail pane') %]
+                        [% l('Always display Volume/Item Detail pane') %]
                     </label>
                 </div>
             </div>
@@ -18,7 +18,7 @@
                 <div class="col-xs-12">
                     <label>
                         <input type="checkbox" ng-change="saveDefaults()" ng-model="defaults.show_vol_template_controls"/>
-                        [% l('Allow Call Number attributes in Copy Templates') %]
+                        [% l('Allow Call Number attributes in Item Templates') %]
                     </label>
                 </div>
             </div>
@@ -80,13 +80,13 @@
         <div class="col-md-5">
             <div class="row">
                 <div class="col-xs-12">
-                    <h4>[% l('Display defaults for Working Copy tab') %]</h4>
+                    <h4>[% l('Display defaults for Working Item tab') %]</h4>
                 </div>
             </div>
 
             <div class="row">
                 <div class="col-xs-6">
-                    <h6>[% l('Copy display') %]</h6>
+                    <h6>[% l('Item display') %]</h6>
                 </div>
                 <div class="col-xs-6">
                     <h6>[% l('Miscellaneous') %]</h6>
@@ -103,7 +103,7 @@
                 <div class="col-xs-6">
                     <label>
                         <input type="checkbox" ng-change="saveDefaults()" ng-model="defaults.attributes.alerts"/>
-                        [% l('Add/Edit Copy Alerts') %]
+                        [% l('Add/Edit Item Alerts') %]
                     </label>
                 </div>
             </div>
@@ -231,7 +231,7 @@
                 <div class="col-xs-6">
                     <label>
                         <input type="checkbox" ng-change="saveDefaults()" ng-model="defaults.copy_notes"/>
-                        [% l('Add/Edit Copy Notes') %]
+                        [% l('Add/Edit Item Notes') %]
                     </label>
                 </div>
             </div>
@@ -246,7 +246,7 @@
                 <div class="col-xs-6">
                     <label>
                         <input type="checkbox" ng-change="saveDefaults()" ng-model="defaults.copy_notes_pub"/>
-                        [% l('Copy Notes are Public') %]
+                        [% l('Item Notes are Public') %]
                     </label>
                 </div>
             </div>
@@ -305,7 +305,7 @@
                 <div class="col-xs-6">
                     <label>
                         <input type="checkbox" ng-change="saveDefaults()" ng-model="defaults.copy_tags"/>
-                        [% l('Add/Edit Copy Tags') %]
+                        [% l('Add/Edit Item Tags') %]
                     </label>
                 </div>
             </div>
@@ -315,7 +315,7 @@
         <div class="col-md-4">
             <div class="row">
                 <div class="col-xs-12">
-                    <h4>[% l('Display defaults for Completed Copies tab') %]</h4>
+                    <h4>[% l('Display defaults for Completed Items tab') %]</h4>
                 </div>
             </div>
 
diff --git a/Open-ILS/src/templates/staff/cat/volcopy/t_edit.tt2 b/Open-ILS/src/templates/staff/cat/volcopy/t_edit.tt2
index 1404983..27a0aed 100644
--- a/Open-ILS/src/templates/staff/cat/volcopy/t_edit.tt2
+++ b/Open-ILS/src/templates/staff/cat/volcopy/t_edit.tt2
@@ -4,12 +4,12 @@
     <script>window.empty_label_string = "[% l('Missing Call Number') %]";</script>
     <div ng-show="!only_vols" class="btn-group">
         <label class="btn btn-default" ng-click="show_vols = !show_vols">
-            <span ng-show="show_vols" style="padding-right: 5px;">[% l('Hide Volume/Copy Details') %]</span>
-            <span ng-hide="show_vols" style="padding-right: 5px;">[% l('Show Volume/Copy Details') %]</span>
+            <span ng-show="show_vols" style="padding-right: 5px;">[% l('Hide Volume/Item Details') %]</span>
+            <span ng-hide="show_vols" style="padding-right: 5px;">[% l('Show Volume/Item Details') %]</span>
         </label>
         <label class="btn btn-default" ng-click="show_copies = !show_copies">
-            <span ng-show="show_copies" style="padding-right: 5px;">[% l('Hide Copy Attributes') %]</span>
-            <span ng-hide="show_copies" style="padding-right: 5px;">[% l('Show Copy Attributes') %]</span>
+            <span ng-show="show_copies" style="padding-right: 5px;">[% l('Hide Item Attributes') %]</span>
+            <span ng-hide="show_copies" style="padding-right: 5px;">[% l('Show Item Attributes') %]</span>
         </label>
     </div>
 
@@ -46,11 +46,11 @@
                     <div class="col-xs-1"><b>[% l('Prefix') %]</b></div>
                     <div class="col-xs-2"><b>[% l('Call Number') %]</b></div>
                     <div class="col-xs-1"><b>[% l('Suffix') %]</b></div>
-                    <div class="col-xs-1" ng-hide="only_vols"><b>[% l('Copies') %]</b></div>
+                    <div class="col-xs-1" ng-hide="only_vols"><b>[% l('Items') %]</b></div>
                     <div class="col-xs-5" ng-hide="only_vols">
                         <div class="row">
                             <div class="col-xs-5"><b>[% l('Barcode') %]</b></div>
-                            <div class="col-xs-3"><b>[% l('Copy #') %]</b></div>
+                            <div class="col-xs-3"><b>[% l('Item #') %]</b></div>
                             <div class="col-xs-4"><b>[% l('Part') %]</b></div>
                         </div>
                     </div>
@@ -87,10 +87,10 @@
 
         <ul ng-model="copytab" class="nav nav-tabs">
           <li ng-class="{active : copytab == 'working'}">
-            <a ng-click="copytab='working'" >[% l('Working Copies') %]</a>
+            <a ng-click="copytab='working'" >[% l('Working Items') %]</a>
           </li>
           <li ng-class="{active : copytab == 'complete'}">
-            <a ng-click="copytab='complete'" >[% l('Completed Copies') %]</a>
+            <a ng-click="copytab='complete'" >[% l('Completed Items') %]</a>
           </li>
         </ul>
 
@@ -125,7 +125,7 @@
                           <eg-grid-field label="[% l('CN Prefix') %]" path="call_number.prefix.label" visible></eg-grid-field>
                           <eg-grid-field label="[% l('Call Number') %]" path="call_number.label" visible></eg-grid-field>
                           <eg-grid-field label="[% l('CN Suffix') %]" path="call_number.suffix.label" visible></eg-grid-field>
-                          <eg-grid-field label="[% l('Copy ID') %]"     path="id" hidden></eg-grid-field>
+                          <eg-grid-field label="[% l('Item ID') %]"     path="id" hidden></eg-grid-field>
                         
                         </eg-grid>
         
@@ -169,7 +169,7 @@
                  <eg-grid-field label="[% l('Reference?') %]"  path="ref" visible></eg-grid-field>
                  <eg-grid-field label="[% l('Status') %]"      flesher="statusById" path="status.name" visible></eg-grid-field>
                  <eg-grid-field label="[% l('OPAC Visible') %]" path="opac_visible" visible></eg-grid-field>
-                 <eg-grid-field label="[% l('Copy ID') %]"      path="id" hidden></eg-grid-field>
+                 <eg-grid-field label="[% l('Item ID') %]"      path="id" hidden></eg-grid-field>
 
                </eg-grid>
             </div>
diff --git a/Open-ILS/src/templates/staff/cat/volcopy/t_view.tt2 b/Open-ILS/src/templates/staff/cat/volcopy/t_view.tt2
index d033666..0226696 100644
--- a/Open-ILS/src/templates/staff/cat/volcopy/t_view.tt2
+++ b/Open-ILS/src/templates/staff/cat/volcopy/t_view.tt2
@@ -18,7 +18,7 @@ eg-navbar {
       <a ng-click="tab = 'edit'" >[% l('Edit') %]</a>
     </li>
     <li ng-class="{active : tab == 'templates'}">
-      <a ng-click="tab = 'templates'" >[% l('Copy Templates') %]</a>
+      <a ng-click="tab = 'templates'" >[% l('Item Templates') %]</a>
     </li>
     <li ng-class="{active : tab == 'defaults'}">
       <a ng-click="tab = 'defaults'" >[% l('Defaults') %]</a>
@@ -42,7 +42,7 @@ eg-navbar {
 
 <div ng-if="edit_templates">
   <div class="row">
-    <h2>[% l("Edit Volume/Copy Templates") %]</h2>
+    <h2>[% l("Edit Volume/Item Templates") %]</h2>
   </div>
   <div class="row">
     <eg-vol-template edit-templates="edit_templates"></eg-vol-template>
diff --git a/Open-ILS/src/templates/staff/circ/checkin/t_checkin_table.tt2 b/Open-ILS/src/templates/staff/circ/checkin/t_checkin_table.tt2
index 2d0aa30..716e408 100644
--- a/Open-ILS/src/templates/staff/circ/checkin/t_checkin_table.tt2
+++ b/Open-ILS/src/templates/staff/circ/checkin/t_checkin_table.tt2
@@ -33,11 +33,11 @@
   </eg-grid-action>
   <eg-grid-action 
     handler="addCopyAlerts"
-    label="[% l('Add Copy Alerts') %]">
+    label="[% l('Add Item Alerts') %]">
   </eg-grid-action>
   <eg-grid-action 
     handler="manageCopyAlerts"
-    label="[% l('Manage Copy Alerts') %]">
+    label="[% l('Manage Item Alerts') %]">
   </eg-grid-action>
 
   <!-- Show Group -->
diff --git a/Open-ILS/src/templates/staff/circ/holds/t_pull_list.tt2 b/Open-ILS/src/templates/staff/circ/holds/t_pull_list.tt2
index 2da3195..54e6362 100644
--- a/Open-ILS/src/templates/staff/circ/holds/t_pull_list.tt2
+++ b/Open-ILS/src/templates/staff/circ/holds/t_pull_list.tt2
@@ -26,7 +26,7 @@
     label="[% l('Retrieve Patron') %]"></eg-grid-action>
   <eg-grid-action divider="true"></eg-grid-action>
   <eg-grid-action handler="grid_actions.set_copy_quality"
-    label="[% l('Set Desired Copy Quality') %]"></eg-grid-action>
+    label="[% l('Set Desired Item Quality') %]"></eg-grid-action>
   <eg-grid-action handler="grid_actions.edit_pickup_lib"
     label="[% l('Edit Pickup Library') %]"></eg-grid-action>
   <eg-grid-action handler="grid_actions.edit_notify_prefs"
@@ -102,7 +102,7 @@
   <eg-grid-field name="copy_id" 
     path="current_copy.id" hidden required></eg-grid-field>
   <eg-grid-field name="barcode" 
-    path="current_copy.barcode" label="[% l('Current Copy') %]">
+    path="current_copy.barcode" label="[% l('Current Item') %]">
     <a href="./cat/item/{{item.copy_id}}/summary" target="_self">
       {{item.barcode}}
     </a>
@@ -110,9 +110,9 @@
   <eg-grid-field name="parts" path="part.label"
     label="[% l('Parts') %]"></eg-grid-field>
   <eg-grid-field name="copy_status" path="current_copy.status.name" 
-    label="[% l('Copy Status') %]"></eg-grid-field>
+    label="[% l('Item Status') %]"></eg-grid-field>
   <eg-grid-field name="copy_circ_lib_id" path="current_copy.circ_lib.id" 
-    required hidden label="[% l('Copy Circ Lib ID') %]"></eg-grid-field>
+    required hidden label="[% l('Item Circ Lib ID') %]"></eg-grid-field>
   <eg-grid-field name="notes" path="notes.body" 
     hidden required label="[% l('Hold Notes') %]"></eg-grid-field>
   <eg-grid-field name="patron_id" path="usr.id" hidden required></eg-grid-field>
@@ -145,7 +145,7 @@
     hidden required label="[% l('Phone Notify') %]"></eg-grid-field>
   <eg-grid-field name="staff_hold" path="_is_staff_hold" datatype="bool"
     required hidden label="[% l('Staff Hold') %]"></eg-grid-field>
-  <eg-grid-field label="[% l('Potential Copies') %]" 
+  <eg-grid-field label="[% l('Potential Items') %]" 
     path='potential_copies'></eg-grid-field>
   <eg-grid-field label="[% l('Queue Position') %]" 
     path='queue_position' hidden></eg-grid-field>
@@ -153,7 +153,7 @@
   </eg-grid-field>
   <eg-grid-field label="[% l('Circ Modifier') %]" path='current_copy.circ_modifier' hidden>
   </eg-grid-field>
-  <eg-grid-field label="[% l('Copy Status Change Time') %]" path='current_copy.status_changed_time' datatype="timestamp" hidden required>
+  <eg-grid-field label="[% l('Item Status Change Time') %]" path='current_copy.status_changed_time' datatype="timestamp" hidden required>
   </eg-grid-field>
   <eg-grid-field label="[% l('Hold Type') %]" path='hold_type' hidden required>
   </eg-grid-field>
diff --git a/Open-ILS/src/templates/staff/circ/holds/t_shelf_list.tt2 b/Open-ILS/src/templates/staff/circ/holds/t_shelf_list.tt2
index f401c1e..083edec 100644
--- a/Open-ILS/src/templates/staff/circ/holds/t_shelf_list.tt2
+++ b/Open-ILS/src/templates/staff/circ/holds/t_shelf_list.tt2
@@ -29,7 +29,7 @@
     label="[% l('Retrieve Patron') %]"></eg-grid-action>
   <eg-grid-action divider="true"></eg-grid-action>
   <eg-grid-action handler="grid_actions.set_copy_quality_wide"
-    label="[% l('Set Desired Copy Quality') %]"></eg-grid-action>
+    label="[% l('Set Desired Item Quality') %]"></eg-grid-action>
   <eg-grid-action handler="grid_actions.edit_pickup_lib_wide"
     label="[% l('Edit Pickup Library') %]"></eg-grid-action>
   <eg-grid-action handler="grid_actions.edit_notify_prefs_wide"
@@ -59,7 +59,7 @@
     label="[% l('Uncancel Hold') %]"></eg-grid-action>
 
   <eg-grid-field label="[% l('Hold ID') %]" path='hold.id'></eg-grid-field>
-  <eg-grid-field label="[% l('Current Copy') %]" 
+  <eg-grid-field label="[% l('Current Item') %]" 
     path='hold.cp_barcode'>
     <a href="./cat/item/{{item.hold.cp_id}}/summary" target="_self">
       {{item.hold.cp_barcode}}
@@ -80,11 +80,11 @@
   </eg-grid-field>
 
   <eg-grid-field label="[% l('Author') %]" path='hold.author'></eg-grid-field>
-  <eg-grid-field label="[% l('Potential Copies') %]" path='hold.potentials'></eg-grid-field>
+  <eg-grid-field label="[% l('Potential Items') %]" path='hold.potentials'></eg-grid-field>
   <eg-grid-field label="[% l('Status') %]" path='status_string'></eg-grid-field>
 
   <eg-grid-field label="[% l('Queue Position') %]" path='hold.relative_queue_position' hidden></eg-grid-field>
-  <eg-grid-field label="[% l('Copy Status') %]" path="hold.cs_name" hidden></eg-grid-field>
+  <eg-grid-field label="[% l('Item Status') %]" path="hold.cs_name" hidden></eg-grid-field>
 
   <eg-grid-field label="[% l('Fulfillment Date/Time') %]" path='hold.fulfillment_time' datatype="timestamp" hidden></eg-grid-field>
   <eg-grid-field label="[% l('Checkin Time') %]" path='hold.checkin_time' datatype="timestamp" hidden></eg-grid-field>
diff --git a/Open-ILS/src/templates/staff/circ/in_house_use/index.tt2 b/Open-ILS/src/templates/staff/circ/in_house_use/index.tt2
index 3af529e..5f4e873 100644
--- a/Open-ILS/src/templates/staff/circ/in_house_use/index.tt2
+++ b/Open-ILS/src/templates/staff/circ/in_house_use/index.tt2
@@ -63,7 +63,7 @@
 </form>
 
 <div clas="row" ng-if="copyNotFound">
-  <div class="col-md-6 alert alert-danger">[% l('Copy Not Found') %]</div>
+  <div class="col-md-6 alert alert-danger">[% l('Item Not Found') %]</div>
 </div>
 
 <eg-grid
@@ -80,7 +80,7 @@
   <eg-grid-field label="[% l('CN Suffix') %]" path="copy.call_number.suffix.label" visible></eg-grid-field>
   <eg-grid-field label="[% l('Location') %]"    path="copy.location.name" visible></eg-grid-field>
   <eg-grid-field label="[% l('Title') %]"       path="title" visible></eg-grid-field>
-  <eg-grid-field label="[% l('Copy Status') %]" path="copy.status.name" visible></eg-grid-field>
+  <eg-grid-field label="[% l('Item Status') %]" path="copy.status.name" visible></eg-grid-field>
 </eg-grid>
 
 <div class="flex-row pad-vert">
diff --git a/Open-ILS/src/templates/staff/circ/patron/t_bills.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_bills.tt2
index b143175..58e3322 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_bills.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_bills.tt2
@@ -121,7 +121,7 @@ not sure what's up, there. -->
       </label>
     </div>
     <div class="form-group" style="margin-left:10px">
-      <label for="bill-receipt-copies">[% l('# Copies') %]</label>
+      <label for="bill-receipt-copies">[% l('# Items') %]</label>
       <input type="number" min="1" style="width:5em"
         ng-model="receipt_count"
         class="form-control" id="bill-receipt-copies"/>
diff --git a/Open-ILS/src/templates/staff/circ/patron/t_bills_list.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_bills_list.tt2
index 6c3d2c1..a29aa3d 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_bills_list.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_bills_list.tt2
@@ -24,7 +24,7 @@
 
   <!--
   need to decide if these are necessary here w/ inline links
-  to record and copy details (though they could be hidden).
+  to record and item details (though they could be hidden).
   it's misleading to allow the user to select multiple bills
   but only open the link to one
 
@@ -75,9 +75,9 @@
       {{item.copy_barcode}}
     </a>
   </eg-grid-field>
-  <!-- fetch the copy ID so we can link to it.  hide it by default -->
+  <!-- fetch the item ID so we can link to it.  hide it by default -->
   <eg-grid-field path="circulation.target_copy.id" 
-    label="[% l('Copy ID') %]" name="copy_id" required hidden>
+    label="[% l('Item ID') %]" name="copy_id" required hidden>
   </eg-grid-field>
 
   <eg-grid-field path="circulation.target_copy.circ_modifier" 
diff --git a/Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2
index 309c82a..1db71f1 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2
@@ -96,11 +96,11 @@
 
   <eg-grid-action
     handler="addCopyAlerts"
-    label="[% l('Add Copy Alerts') %]">
+    label="[% l('Add Item Alerts') %]">
   </eg-grid-action>
   <eg-grid-action
     handler="manageCopyAlerts"
-    label="[% l('Manage Copy Alerts') %]">
+    label="[% l('Manage Item Alerts') %]">
   </eg-grid-action>
 
   <eg-grid-field label="[% l('Balance Owed') %]"     
diff --git a/Open-ILS/src/templates/staff/circ/patron/t_holds_list.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_holds_list.tt2
index 8f46910..fd544aa 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_holds_list.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_holds_list.tt2
@@ -16,7 +16,7 @@
     label="[% l('Show Holds for Title') %]"></eg-grid-action>
   <eg-grid-action divider="true"></eg-grid-action>
   <eg-grid-action handler="grid_actions.set_copy_quality"
-    label="[% l('Set Desired Copy Quality') %]"></eg-grid-action>
+    label="[% l('Set Desired Item Quality') %]"></eg-grid-action>
   <eg-grid-action handler="grid_actions.edit_pickup_lib"
     label="[% l('Edit Pickup Library') %]"></eg-grid-action>
   <eg-grid-action handler="grid_actions.edit_notify_prefs"
@@ -46,7 +46,7 @@
     label="[% l('Uncancel Hold') %]"></eg-grid-action>
 
   <eg-grid-field label="[% l('Hold ID') %]" path='hold.id'></eg-grid-field>
-  <eg-grid-field label="[% l('Current Copy') %]" 
+  <eg-grid-field label="[% l('Current Item') %]" 
     path='hold.current_copy.barcode'>
     <a href="./cat/item/{{item.hold.current_copy().id()}}/summary" target="_self">
       {{item.hold.current_copy().barcode()}}
@@ -70,7 +70,7 @@
   </eg-grid-field>
 
   <eg-grid-field label="[% l('Author') %]" path='mvr.author'></eg-grid-field>
-  <eg-grid-field label="[% l('Potential Copies') %]" path='potential_copies'></eg-grid-field>
+  <eg-grid-field label="[% l('Potential Items') %]" path='potential_copies'></eg-grid-field>
   <eg-grid-field label="[% l('Status') %]" path='status_string'></eg-grid-field>
 
   <eg-grid-field label="[% l('Queue Position') %]" path='queue_position' hidden></eg-grid-field>
diff --git a/Open-ILS/src/templates/staff/circ/patron/t_items_out.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_items_out.tt2
index 33d3796..5a5aee9 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_items_out.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_items_out.tt2
@@ -95,7 +95,7 @@
   </eg-grid-field>
   <eg-grid-field path="*" hidden></eg-grid-field>
   <eg-grid-field path="target_copy.holds_count.count" hidden></eg-grid-field>
-  <eg-grid-field label="[% l('Copy Status') %]" path="target_copy.status.name" hidden></eg-grid-field>
+  <eg-grid-field label="[% l('Item Status') %]" path="target_copy.status.name" hidden></eg-grid-field>
   <eg-grid-field path="target_copy.circ_modifier" hidden></eg-grid-field>
   <eg-grid-field path="target_copy.*" hidden></eg-grid-field>
   <eg-grid-field path="target_copy.call_number.*" hidden></eg-grid-field>
diff --git a/Open-ILS/src/templates/staff/circ/renew/t_renew.tt2 b/Open-ILS/src/templates/staff/circ/renew/t_renew.tt2
index 41866f4..886e93f 100644
--- a/Open-ILS/src/templates/staff/circ/renew/t_renew.tt2
+++ b/Open-ILS/src/templates/staff/circ/renew/t_renew.tt2
@@ -69,11 +69,11 @@
   <eg-grid-action divider="true"></eg-grid-action>
   <eg-grid-action
     handler="addCopyAlerts"
-    label="[% l('Add Copy Alerts') %]">
+    label="[% l('Add Item Alerts') %]">
   </eg-grid-action>
   <eg-grid-action
     handler="manageCopyAlerts"
-    label="[% l('Manage Copy Alerts') %]">
+    label="[% l('Manage Item Alerts') %]">
   </eg-grid-action>
 
 
diff --git a/Open-ILS/src/templates/staff/circ/share/circ_strings.tt2 b/Open-ILS/src/templates/staff/circ/share/circ_strings.tt2
index 6675b99..592365b 100644
--- a/Open-ILS/src/templates/staff/circ/share/circ_strings.tt2
+++ b/Open-ILS/src/templates/staff/circ/share/circ_strings.tt2
@@ -11,13 +11,13 @@ s.PATRON_ACCOUNT_EXPIRED =
 s.CIRC_CLAIMS_RETURNED = 
   '[% l('Item "[_1]" is marked as Claims Returned', '{{barcode}}') %]';
 s.CHECKOUT_FAILED_GENERIC =
-  '[% l('Unable to checkout copy "[_1]" : [_2]', '{{barcode}}', '{{textcode}}') %]';
+  '[% l('Unable to checkout item "[_1]" : [_2]', '{{barcode}}', '{{textcode}}') %]';
 s.EMAILED_CHECKOUT_RECEIPT =
   "[% l('Emailed checkout receipt') %]";
 s.COPY_ALERT_MSG_DIALOG_TITLE =
-  '[% l('Copy Alert Message for "[_1]"', '{{copy_barcode}}') %]';
+  '[% l('Item Alert Message for "[_1]"', '{{copy_barcode}}') %]';
 s.UNCAT_ALERT_DIALOG =
-  '[% l('Copy "[_1]" was mis-scanned or is not cataloged', '{{copy_barcode}}') %]';
+  '[% l('Item "[_1]" was mis-scanned or is not cataloged', '{{copy_barcode}}') %]';
 s.PERMISSION_DENIED = 
   '[% l('Permission Denied : [_1]', '{{permission}}') %]';
 s.PRECAT_CHECKIN_MSG = 
@@ -30,7 +30,7 @@ s.MARK_MISSING_CONFIRM = '[% l("Mark {{num_items}} items as MISSING?") %]';
 s.ABORT_TRANSIT_CONFIRM = '[% l("Cancel {{num_transits}} transits?") %]';
 s.ROUTE_TO_HOLDS_SHELF = '[% l("Holds Shelf") %]';
 s.ROUTE_TO_CATALOGING = '[% l("Cataloging") %]';
-s.COPY_IN_TRANSIT = '[% l("Copy is In-Transit") %]';
+s.COPY_IN_TRANSIT = '[% l("Item is In-Transit") %]';
 s.TOO_MANY_CLAIMS_RETURNED = 
   '[% l("Patron exceeds claims returned count.  Force this action?") %]';
 s.MARK_NEVER_CHECKED_OUT = 
@@ -38,23 +38,23 @@ s.MARK_NEVER_CHECKED_OUT =
 s.ON_DEMAND_COPY_ALERT = {
     'CHECKIN': {
         'NORMAL' : '[% l("Normal checkin") %]',
-        'LOST' : '[% l("Copy was marked lost") %]',
-        'LOST_AND_PAID' : '[% l("Copy was marked lost and paid for") %]',
-        'MISSING' : '[% l("Copy was marked missing") %]',
-        'DAMAGED' : '[% l("Copy was marked damaged") %]',
-        'CLAIMSRETURNED' : '[% l("Copy was marked claims returned") %]',
-        'LONGOVERDUE' : '[% l("Copy was marked long overdue") %]',
-        'CLAIMSNEVERCHECKEDOUT' : '[% l("Copy was marked claims never checked out") %]'
+        'LOST' : '[% l("Item was marked lost") %]',
+        'LOST_AND_PAID' : '[% l("Item was marked lost and paid for") %]',
+        'MISSING' : '[% l("Item was marked missing") %]',
+        'DAMAGED' : '[% l("Item was marked damaged") %]',
+        'CLAIMSRETURNED' : '[% l("Item was marked claims returned") %]',
+        'LONGOVERDUE' : '[% l("Item was marked long overdue") %]',
+        'CLAIMSNEVERCHECKEDOUT' : '[% l("Item was marked claims never checked out") %]'
     },
     'CHECKOUT': {
         'NORMAL' : '[% l("Normal checkout") %]',
-        'LOST' : '[% l("Copy was marked lost") %]',
-        'LOST_AND_PAID' : '[% l("Copy was marked lost and paid for") %]',
-        'MISSING' : '[% l("Copy was marked missing") %]',
-        'DAMAGED' : '[% l("Copy was marked damaged") %]',
-        'CLAIMSRETURNED' : '[% l("Copy was marked claims returned") %]',
-        'LONGOVERDUE' : '[% l("Copy was marked long overdue") %]',
-        'CLAIMSNEVERCHECKEDOUT' : '[% l("Copy was marked claims never checked out") %]'
+        'LOST' : '[% l("Item was marked lost") %]',
+        'LOST_AND_PAID' : '[% l("Item was marked lost and paid for") %]',
+        'MISSING' : '[% l("Item was marked missing") %]',
+        'DAMAGED' : '[% l("Item was marked damaged") %]',
+        'CLAIMSRETURNED' : '[% l("Item was marked claims returned") %]',
+        'LONGOVERDUE' : '[% l("Item was marked long overdue") %]',
+        'CLAIMSNEVERCHECKEDOUT' : '[% l("Item was marked claims never checked out") %]'
     }
 };
 }]);
diff --git a/Open-ILS/src/templates/staff/circ/share/hold_strings.tt2 b/Open-ILS/src/templates/staff/circ/share/hold_strings.tt2
index 647dac7..5bb570f 100644
--- a/Open-ILS/src/templates/staff/circ/share/hold_strings.tt2
+++ b/Open-ILS/src/templates/staff/circ/share/hold_strings.tt2
@@ -3,7 +3,7 @@
 <script>
 angular.module('egCoreMod').run(['egStrings', function(s) {
 s['HOLD_STATUS_-1'] = "[% l('Error (-1)') %]";
-s.HOLD_STATUS_1 = "[% l('Waiting for Copy') %]";
+s.HOLD_STATUS_1 = "[% l('Waiting for Item') %]";
 s.HOLD_STATUS_2 = "[% l('Waiting for Capture') %]";
 s.HOLD_STATUS_3 = "[% l('In Transit') %]";
 s.HOLD_STATUS_4 = "[% l('Ready for Pickup') %]";
diff --git a/Open-ILS/src/templates/staff/circ/share/t_circ_exists_dialog.tt2 b/Open-ILS/src/templates/staff/circ/share/t_circ_exists_dialog.tt2
index 552de04..0e55b1e 100644
--- a/Open-ILS/src/templates/staff/circ/share/t_circ_exists_dialog.tt2
+++ b/Open-ILS/src/templates/staff/circ/share/t_circ_exists_dialog.tt2
@@ -16,7 +16,7 @@
         <div ng-if="!sameUser">
           [% |l('{{circDate | date:$root.egDateFormat}}') %]
           There is an open circulation on the requested item.  
-          This copy was checked out by another patron on [_1].
+          This item was checked out by another patron on [_1].
           [% END %]
         </div>
       </div>
diff --git a/Open-ILS/src/templates/staff/circ/share/t_copy_in_transit_dialog.tt2 b/Open-ILS/src/templates/staff/circ/share/t_copy_in_transit_dialog.tt2
index 440ac48..f31cf1c 100644
--- a/Open-ILS/src/templates/staff/circ/share/t_copy_in_transit_dialog.tt2
+++ b/Open-ILS/src/templates/staff/circ/share/t_copy_in_transit_dialog.tt2
@@ -2,11 +2,11 @@
   <div class="modal-header">
     <button type="button" class="close" 
       ng-click="cancel()" aria-hidden="true">×</button>
-    <h4 class="modal-title">[% l('Copy In Transit') %]</h4>
+    <h4 class="modal-title">[% l('Item In Transit') %]</h4>
   </div>
   <div class="modal-body">
     <div class="strong-text">
-      [% l('There is an open transit on copy [_1]', 
+      [% l('There is an open transit on item [_1]', 
         '{{transit.target_copy().barcode()}}') %]
     </div>
     <div class="pad-vert"></div>
diff --git a/Open-ILS/src/templates/staff/circ/share/t_copy_not_avail_dialog.tt2 b/Open-ILS/src/templates/staff/circ/share/t_copy_not_avail_dialog.tt2
index 711e777..80fcea9 100644
--- a/Open-ILS/src/templates/staff/circ/share/t_copy_not_avail_dialog.tt2
+++ b/Open-ILS/src/templates/staff/circ/share/t_copy_not_avail_dialog.tt2
@@ -3,12 +3,12 @@
     <button type="button" class="close" 
       ng-click="cancel()" aria-hidden="true">×</button>
     <h4 class="modal-title">
-      [% l('Copy Not Available.') %]
+      [% l('Item Not Available.') %]
     </h4>
   </div>
   <div class="modal-body">
     <div class="alert alert-warning">
-      [% l('Copy Status: [_1]', '{{copyStatus.name()}}') %]
+      [% l('Item Status: [_1]', '{{copyStatus.name()}}') %]
     </div>
   </div>
   <div class="modal-footer">
diff --git a/Open-ILS/src/templates/staff/circ/share/t_hold_details.tt2 b/Open-ILS/src/templates/staff/circ/share/t_hold_details.tt2
index a1c47c2..56e67f5 100644
--- a/Open-ILS/src/templates/staff/circ/share/t_hold_details.tt2
+++ b/Open-ILS/src/templates/staff/circ/share/t_hold_details.tt2
@@ -11,7 +11,7 @@
 <div class="flex-row">
   <div class="flex-cell">[% l('Hold Type') %]</div>
   <div class="flex-cell well">{{hold.hold_type()}}<span ng-if="hold.hold_type() == 'P'"> - {{part.label()}}</span></div>
-  <div class="flex-cell">[% l('Current Copy') %]</div>
+  <div class="flex-cell">[% l('Current Item') %]</div>
   <div class="flex-cell well">
     <a href="./cat/item/{{hold.current_copy().id()}}" target="_self">
       {{hold.current_copy().barcode()}}
@@ -33,7 +33,7 @@
   <div class="flex-cell well">{{hold.current_shelf_lib().shortname()}}</div>
   <div class="flex-cell">[% l('Current Copy Location') %]</div>
   <div class="flex-cell well">{{hold.current_copy().location().name()}}</div>
-  <div class="flex-cell">[% l('Force Copy Quality') %]</div>
+  <div class="flex-cell">[% l('Force Item Quality') %]</div>
   <div class="flex-cell well">{{hold.mint_condition() == 't'}}</div>
 </div>
 <div class="flex-row">
diff --git a/Open-ILS/src/templates/staff/css/cat.css.tt2 b/Open-ILS/src/templates/staff/css/cat.css.tt2
index 8d6cb81..0b8f4ed 100644
--- a/Open-ILS/src/templates/staff/css/cat.css.tt2
+++ b/Open-ILS/src/templates/staff/css/cat.css.tt2
@@ -190,7 +190,7 @@ grid[name="-none-"] * label { color: black; }
 }
 
 /*
- * Volume / Copy Editor Styles
+ * Volume / Item Editor Styles
  * /
 
 /* Wrapping in bootstrap style can separate radio buttons from their labels. */
diff --git a/Open-ILS/src/templates/staff/css/style.css.tt2 b/Open-ILS/src/templates/staff/css/style.css.tt2
index 063da5f..4a2cdd1 100644
--- a/Open-ILS/src/templates/staff/css/style.css.tt2
+++ b/Open-ILS/src/templates/staff/css/style.css.tt2
@@ -196,7 +196,7 @@ table.list tr.selected td { /* deprecated? */
 .barcode { width: 16em !important; }
 
 /* use strike-through to mark something that has been acknowledged,
-   e.g., a copy alert */
+   e.g., a item alert */
 .acknowledged { text-decoration: line-through; }
 
 /* bootstrap alerts are heavily padded.  use this to reduce */
diff --git a/Open-ILS/src/templates/staff/navbar.tt2 b/Open-ILS/src/templates/staff/navbar.tt2
index 7d9e1ce..1c47eb0 100644
--- a/Open-ILS/src/templates/staff/navbar.tt2
+++ b/Open-ILS/src/templates/staff/navbar.tt2
@@ -47,7 +47,7 @@
               eg-accesskey="[% l('f5') %]" 
               eg-accesskey-desc="[% l('Item Status') %]">
               <span class="glyphicon glyphicon-barcode"></span>
-              <span>[% l('Search for Copies by Barcode') %]</span>
+              <span>[% l('Search for Items by Barcode') %]</span>
             </a>
           </li>
           <li>
@@ -272,7 +272,7 @@
           <li>
             <a href="./cat/bucket/copy/view" target="_self">
               <span class="glyphicon glyphicon-list-alt"></span>
-              [% l('Copy Buckets') %]
+              [% l('Item Buckets') %]
             </a>
           </li>
           <li class="divider"></li>
diff --git a/Open-ILS/src/templates/staff/serials/t_subscription_manager.tt2 b/Open-ILS/src/templates/staff/serials/t_subscription_manager.tt2
index c104e9f..ab8b572 100644
--- a/Open-ILS/src/templates/staff/serials/t_subscription_manager.tt2
+++ b/Open-ILS/src/templates/staff/serials/t_subscription_manager.tt2
@@ -37,7 +37,7 @@
       </div>
       <div class="form-group col-sm-3">
         <label>[% l('Expected Offset') %]
-          <eg-help-popover help-text="[% l('The difference between the nominal publishing date of an issue and the date that you expect to receive your copy.') %]">
+          <eg-help-popover help-text="[% l('The difference between the nominal publishing date of an issue and the date that you expect to receive your item.') %]">
         </label>
         <input class="form-control" type="text" ng-model="ssub.expected_date_offset"></input>
       </div>
@@ -77,7 +77,7 @@
           </select>
         </div>
         <div class="col-sm-1" style="padding-left:0"><!-- Yes, it's terrible. But, nested grid alignment... -->
-          <button class="btn btn-sm btn-info" ng-click="add_stream(sdist, true)">[% l('Add copy stream') %]</button>
+          <button class="btn btn-sm btn-info" ng-click="add_stream(sdist, true)">[% l('Add item stream') %]</button>
         </div>
       </div>
       <div class="row form-inline pad-vert">
@@ -136,7 +136,7 @@
     <eg-grid-field label="[% l('Owning Library') %]" path="owning_lib.name" visible></eg-grid-field>
     <eg-grid-field label="[% l('Distribution Library') %]" path="sdist.holding_lib.name" visible></eg-grid-field>
     <eg-grid-field label="[% l('Distribution Label') %]" path="sdist.label" visible></eg-grid-field>
-    <eg-grid-field label="[% l('Copy Stream') %]" path="sstr.id" visible></eg-grid-field>
+    <eg-grid-field label="[% l('Item Stream') %]" path="sstr.id" visible></eg-grid-field>
     <eg-grid-field label="[% l('Offset') %]" path="expected_date_offset" visible></eg-grid-field>
     <eg-grid-field label="[% l('Start Date') %]" path="start_date" datatype="timestamp" visible></eg-grid-field>
     <eg-grid-field label="[% l('End Date') %]" path="end_date" datatype="timestamp" visible></eg-grid-field>
diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_bill_payment.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_bill_payment.tt2
index 0147d50..029fa5b 100644
--- a/Open-ILS/src/templates/staff/share/print_templates/t_bill_payment.tt2
+++ b/Open-ILS/src/templates/staff/share/print_templates/t_bill_payment.tt2
@@ -22,8 +22,8 @@ includes:
 * payments - list of specific payments
 
 Individual payments within payments contain:
-* payment.xact.copy_barcode - Copy barcode
-* payment.xact.title - Copy title
+* payment.xact.copy_barcode - Item barcode
+* payment.xact.title - Item title
 -->
 Welcome to {{current_location.name}}!<br/>
 A receipt of your  transaction:<hr/>
diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_bills_current.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_bills_current.tt2
index c2b287f..cf6df66 100644
--- a/Open-ILS/src/templates/staff/share/print_templates/t_bills_current.tt2
+++ b/Open-ILS/src/templates/staff/share/print_templates/t_bills_current.tt2
@@ -21,8 +21,8 @@ to this template includes:
 * transasctions - a list of transactions, each of which
   contains:
     xact.summary - information about the transaction
-    xact.title - Copy title
-    xact.copy_barcode - Copy barcode
+    xact.title - Item title
+    xact.copy_barcode - Item barcode
 -->
 Welcome to {{current_location.name}}!<br/>
 You have the following bills:
diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_bills_historical.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_bills_historical.tt2
index d1caaf2..9c66cc9 100644
--- a/Open-ILS/src/templates/staff/share/print_templates/t_bills_historical.tt2
+++ b/Open-ILS/src/templates/staff/share/print_templates/t_bills_historical.tt2
@@ -20,7 +20,7 @@ to this template includes:
     pref_ versions of all name fields (e.g. pref_family_name);
 * transasctions - a list of transactions, each of which contains:
   xact.id - Bill unique id
-  xact.copy_barcode - Copy barcode
+  xact.copy_barcode - Item barcode
   xact.xact_finish - Billing finish date and time
   xact.xact_start - Billing start date and time
   xact.summary - Information about the transaction
@@ -33,10 +33,10 @@ to this template includes:
     xact.summary.total_owed - Total billed 
     xact.summary.total_paid - Total paid
     xact.summary.xact_type - Billing type 
-  xact.title - Copy title
+  xact.title - Item title
     xact.summary - information about the transaction
-    xact.title - Copy title
-    xact.copy_barcode - Copy barcode
+    xact.title - Item title
+    xact.copy_barcode - Item barcode
 
 -->
 Welcome to {{current_location.name}}!<br/>
diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_holds_for_bib.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_holds_for_bib.tt2
index e3c8c68..df2eda5 100644
--- a/Open-ILS/src/templates/staff/share/print_templates/t_holds_for_bib.tt2
+++ b/Open-ILS/src/templates/staff/share/print_templates/t_holds_for_bib.tt2
@@ -22,7 +22,7 @@ bib record. Fields include:
         <th>[% l('Patron Barcode') %]</th>
         <th>[% l('Patron Last') %]</th>
         <th>[% l('Patron Alias') %]</th>
-        <th>[% l('Current Copy') %]</th>
+        <th>[% l('Current Item') %]</th>
       </tr>
     </thead>
     <tbody>
diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_in_house_use_list.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_in_house_use_list.tt2
index 17caa2f..33bf6e4 100644
--- a/Open-ILS/src/templates/staff/share/print_templates/t_in_house_use_list.tt2
+++ b/Open-ILS/src/templates/staff/share/print_templates/t_in_house_use_list.tt2
@@ -5,13 +5,13 @@ includes:
 in_house_uses - list; each entry contains:
 
   * num_uses - number of uses
-  * copy - data for a copy, including the following keys:
+  * copy - data for an item, including the following keys:
 
               barcode : barcode
               location.name : shelving location
               call_number.label : call number
 
-  * title - copy title
+  * title - item title
 -->
 <div>
   <div>[% l('You marked the following in-house items used:') %]</div>
diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_item_status.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_item_status.tt2
index 8d279b3..60ac87a 100644
--- a/Open-ILS/src/templates/staff/share/print_templates/t_item_status.tt2
+++ b/Open-ILS/src/templates/staff/share/print_templates/t_item_status.tt2
@@ -2,7 +2,7 @@
 Template for printing copies from the Item Status page. Available
 macros include:
 
-copies - list; each entry is a fleshed, flattened copy record
+copies - list; each entry is a fleshed, flattened item record
 with a variety of keys, including
 
   barcode
diff --git a/Open-ILS/src/templates/staff/share/t_add_copy_alert_dialog.tt2 b/Open-ILS/src/templates/staff/share/t_add_copy_alert_dialog.tt2
index 48b556d..32c6196 100644
--- a/Open-ILS/src/templates/staff/share/t_add_copy_alert_dialog.tt2
+++ b/Open-ILS/src/templates/staff/share/t_add_copy_alert_dialog.tt2
@@ -2,7 +2,7 @@
     <div class="modal-header">
       <button type="button" class="close" ng-click="cancel()" 
         aria-hidden="true">×</button>
-      <h4 class="modal-title">[% l('Add Copy Alert') %]</h4>
+      <h4 class="modal-title">[% l('Add Item Alert') %]</h4>
     </div>
     <div class="modal-body">
       <div class="row">
diff --git a/Open-ILS/src/templates/staff/share/t_copy_alert_editor_dialog.tt2 b/Open-ILS/src/templates/staff/share/t_copy_alert_editor_dialog.tt2
index 9e12317..81b7a66 100644
--- a/Open-ILS/src/templates/staff/share/t_copy_alert_editor_dialog.tt2
+++ b/Open-ILS/src/templates/staff/share/t_copy_alert_editor_dialog.tt2
@@ -2,7 +2,7 @@
     <div class="modal-header">
       <button type="button" class="close" ng-click="cancel()" 
         aria-hidden="true">×</button>
-      <h4 class="modal-title">[% l('Manage Copy Alerts') %]</h4>
+      <h4 class="modal-title">[% l('Manage Item Alerts') %]</h4>
     </div>
     <div class="modal-body">
       <div class="row" ng-repeat="a in copy_alert_list | orderBy:'id()'" ng-init="temp = (a.temp() == 't'); note = a.note(); acked = (a.ack_time() !== null); alert_type = a.alert_type().id()">
diff --git a/Open-ILS/src/templates/staff/share/t_copy_alert_manager_dialog.tt2 b/Open-ILS/src/templates/staff/share/t_copy_alert_manager_dialog.tt2
index 843ea0d..ea1880a 100644
--- a/Open-ILS/src/templates/staff/share/t_copy_alert_manager_dialog.tt2
+++ b/Open-ILS/src/templates/staff/share/t_copy_alert_manager_dialog.tt2
@@ -1,9 +1,9 @@
 <!--
-  Copy alert manager dialog
+  Item alert manager dialog
 -->
 <div>
   <div class="modal-header">
-    <h4 class="modal-title alert alert-info">[% l('Copy alerts') %]</h4> 
+    <h4 class="modal-title alert alert-info">[% l('Item alerts') %]</h4> 
   </div>
   <div class="modal-body">
     <div>
@@ -23,12 +23,12 @@
     <div ng-if="mode == 'checkin' && next_statuses.length > 0">
         <div ng-if="next_statuses.length == 1" class="row">
             <div class="col-md-8">
-                <b>[% l('Next copy status: ') %]</b> {{next_statuses[0].name()}}
+                <b>[% l('Next item status: ') %]</b> {{next_statuses[0].name()}}
             </div>
         </div>
         <div ng-if="next_statuses.length > 1" class="row">
           <div class="col-md-4">
-            <label for="select-next-status"><b>[% l('Next copy status') %]<b></label>
+            <label for="select-next-status"><b>[% l('Next item status') %]<b></label>
           </div>
           <div class="col-md-4">
             <select id="select-next-status" class="form-control"
diff --git a/Open-ILS/src/templates/staff/t_splash.tt2 b/Open-ILS/src/templates/staff/t_splash.tt2
index c096f10..3f135d6 100644
--- a/Open-ILS/src/templates/staff/t_splash.tt2
+++ b/Open-ILS/src/templates/staff/t_splash.tt2
@@ -54,7 +54,7 @@
           </div>
           <div>
             <img src="[% ctx.media_prefix %]/images/portal/bucket.png"/>
-            <a target="_self" href="./cat/bucket/copy/">[% l('Copy Buckets') %]</a>
+            <a target="_self" href="./cat/bucket/copy/">[% l('Item Buckets') %]</a>
           </div>
         </div>
       </div>

-----------------------------------------------------------------------

Summary of changes:
 .../conify/global/asset/copy_location_group.tt2    |    6 ++--
 .../conify/global/asset/copy_location_order.tt2    |    4 +-
 .../templates/staff/admin/local/asset/copy_tag.tt2 |    4 +-
 .../staff/admin/local/autoGridEditor/acas.tt2      |    6 ++--
 .../staff/admin/local/autoGridEditor/ccat.tt2      |    6 ++--
 .../src/templates/staff/admin/local/t_splash.tt2   |   14 ++++----
 .../src/templates/staff/admin/serials/t_splash.tt2 |    2 +-
 .../staff/admin/server/config/copy_tag_type.tt2    |    4 +-
 .../src/templates/staff/admin/server/t_splash.tt2  |    4 +-
 .../staff/admin/workstation/t_print_config.tt2     |    2 +-
 .../src/templates/staff/cat/bucket/copy/index.tt2  |    6 ++--
 .../staff/cat/bucket/copy/t_apply_tags.tt2         |    2 +-
 .../src/templates/staff/cat/bucket/copy/t_view.tt2 |   10 +++---
 Open-ILS/src/templates/staff/cat/catalog/index.tt2 |   12 +++---
 .../src/templates/staff/cat/catalog/t_catalog.tt2  |    2 +-
 .../staff/cat/catalog/t_choose_vol_target_lib.tt2  |    2 +-
 .../staff/cat/catalog/t_conjoined_items.tt2        |    2 +-
 .../src/templates/staff/cat/catalog/t_holdings.tt2 |   36 ++++++++++----------
 .../src/templates/staff/cat/catalog/t_holds.tt2    |   14 ++++----
 Open-ILS/src/templates/staff/cat/item/index.tt2    |   18 +++++-----
 Open-ILS/src/templates/staff/cat/item/t_list.tt2   |   18 +++++-----
 .../templates/staff/cat/item/t_summary_pane.tt2    |    6 ++--
 .../staff/cat/share/t_embedded_volcopy.tt2         |    2 +-
 .../src/templates/staff/cat/share/t_marcedit.tt2   |    4 +-
 .../staff/cat/share/t_replace_barcode.tt2          |    4 +-
 .../templates/staff/cat/share/t_volume_list.tt2    |    6 ++--
 Open-ILS/src/templates/staff/cat/volcopy/index.tt2 |    6 ++--
 .../templates/staff/cat/volcopy/t_attr_edit.tt2    |   10 +++---
 .../templates/staff/cat/volcopy/t_copy_alerts.tt2  |    4 +-
 .../templates/staff/cat/volcopy/t_copy_notes.tt2   |    4 +-
 .../templates/staff/cat/volcopy/t_copy_tags.tt2    |    2 +-
 .../src/templates/staff/cat/volcopy/t_defaults.tt2 |   20 +++++-----
 .../src/templates/staff/cat/volcopy/t_edit.tt2     |   26 +++++++-------
 .../src/templates/staff/cat/volcopy/t_view.tt2     |    4 +-
 .../staff/circ/checkin/t_checkin_table.tt2         |    6 ++--
 .../src/templates/staff/circ/holds/t_pull_list.tt2 |   14 ++++----
 .../templates/staff/circ/holds/t_shelf_list.tt2    |    8 ++--
 .../templates/staff/circ/in_house_use/index.tt2    |    4 +-
 .../src/templates/staff/circ/patron/t_bills.tt2    |    2 +-
 .../templates/staff/circ/patron/t_bills_list.tt2   |    6 ++--
 .../src/templates/staff/circ/patron/t_checkout.tt2 |    4 +-
 .../templates/staff/circ/patron/t_holds_list.tt2   |    6 ++--
 .../templates/staff/circ/patron/t_items_out.tt2    |    2 +-
 .../src/templates/staff/circ/renew/t_renew.tt2     |    4 +-
 .../templates/staff/circ/share/circ_strings.tt2    |   36 ++++++++++----------
 .../templates/staff/circ/share/hold_strings.tt2    |    2 +-
 .../staff/circ/share/t_circ_exists_dialog.tt2      |    2 +-
 .../staff/circ/share/t_copy_in_transit_dialog.tt2  |    4 +-
 .../staff/circ/share/t_copy_not_avail_dialog.tt2   |    4 +-
 .../templates/staff/circ/share/t_hold_details.tt2  |    6 ++--
 .../src/templates/staff/circ/transits/t_list.tt2   |    2 +-
 Open-ILS/src/templates/staff/css/cat.css.tt2       |    2 +-
 Open-ILS/src/templates/staff/css/style.css.tt2     |    2 +-
 Open-ILS/src/templates/staff/navbar.tt2            |    4 +-
 .../templates/staff/serials/t_batch_receive.tt2    |    2 +-
 .../staff/serials/t_subscription_manager.tt2       |    6 ++--
 .../staff/share/print_templates/t_bill_payment.tt2 |    4 +-
 .../share/print_templates/t_bills_current.tt2      |    4 +-
 .../share/print_templates/t_bills_historical.tt2   |    8 ++--
 .../share/print_templates/t_holds_for_bib.tt2      |    2 +-
 .../share/print_templates/t_in_house_use_list.tt2  |    4 +-
 .../staff/share/print_templates/t_item_status.tt2  |    2 +-
 .../staff/share/t_add_copy_alert_dialog.tt2        |    2 +-
 .../staff/share/t_copy_alert_editor_dialog.tt2     |    2 +-
 .../staff/share/t_copy_alert_manager_dialog.tt2    |    8 ++--
 Open-ILS/src/templates/staff/t_splash.tt2          |    2 +-
 Open-ILS/web/opac/locale/en-US/lang.dtd            |    4 +-
 .../Client/consistent-terminology.adoc             |   16 +++++++++
 68 files changed, 237 insertions(+), 221 deletions(-)
 create mode 100644 docs/RELEASE_NOTES_NEXT/Client/consistent-terminology.adoc


hooks/post-receive
-- 
Evergreen ILS


More information about the open-ils-commits mailing list