From 060f96dc051a1764b9201a894098bcff03362c00 Mon Sep 17 00:00:00 2001
From: Galen Charlton <gmcharlt@gmail.com>
Date: Sat, 30 Oct 2010 01:13:23 -0400
Subject: [PATCH] tweak wording of merge target

Since the merge functionality is for merging biblio
records, not items, made the language more precise.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
---
 .../prog/en/modules/help/cataloguing/merge.tmpl           | 8 ++++----
 .../prog/en/modules/virtualshelves/shelves.tmpl           | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/merge.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/merge.tmpl
index 74357a0a84..aba4e22629 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/merge.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/merge.tmpl
@@ -2,13 +2,13 @@
 
 <h1>Merging Items</h1>
 
-<p style="color: rgb(153, 0, 0);">Important: Merging will only work with two items that use the same bibliographic framework.</p>
+<p style="color: rgb(153, 0, 0);">Important: Merging will only work with two bibliographic records that use the same bibliographic framework.</p>
 
 <p>The easiest way to merge together duplicate bibliographic records is to add them to a list and use the Merge Tool from there.</p>
 
-<p>From the list, check the two items you want to merge. If you choose more than or fewer than 2, you will be presented with an error.</p>
+<p>From the list, check the two bibliographic records you want to merge. If you choose more than or fewer than 2, you will be presented with an error.</p>
 
-<p>Once you have selected the records you want to merge, click the 'Merge selected items' button. You will be asked which of the two records you would like to keep as your primary record and which will be deleted after the merge.</p>
+<p>Once you have selected the records you want to merge, click the 'Merge selected records' button. You will be asked which of the two records you would like to keep as your primary record and which will be deleted after the merge.</p>
 
 <p>You will be presented with the MARC for both of the records (each accessible by tabs labeled with the bib numbers for those records). By default the entire first record will be selected, uncheck the fields you don't want in the final (destination) record and then move on to the second tab to choose which fields should be in the final (destination) record.</p>
 
@@ -20,4 +20,4 @@
 
 <p style="color: rgb(153, 0, 0);">Important: It is important to rebuild your zebra index immediately after merging records. If a search is performed for a record which has been deleted Koha will present the patrons with an error in the OPAC.</p>
 
-<!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file
+<!-- TMPL_INCLUDE name="help-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
index 547668ac4d..35c022b413 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
@@ -211,8 +211,8 @@ function placeHold () {
     </table><fieldset class="action">
         <!-- TMPL_IF name="manageshelf" -->
             <input type="button" id="placehold" style="display:none" onclick="placeHold(); return false;" value="Place Holds" />
-            <input type="submit" value="Remove selected Items" onclick="return confirm(_('Are you sure you want to remove these items from the shelf?'));" />
-            <input type="submit" value="Merge selected Items" onclick="return MergeItems();" />
+            <input type="submit" value="Remove selected records" onclick="return confirm(_('Are you sure you want to remove these records from the shelf?'));" />
+            <input type="submit" value="Merge selected records" onclick="return MergeItems();" />
         <!-- /TMPL_IF -->
  </fieldset>
  </fieldset>
-- 
2.39.5