From 015319dbaf655a51492537401e9cbb5a7263a37c Mon Sep 17 00:00:00 2001
From: Galen Charlton <gmc@esilibrary.com>
Date: Mon, 16 Sep 2013 17:41:51 +0000
Subject: [PATCH] Bug 10513: (follow-up) use "checkin" rather than "check in"

"Checkin" is by far more commonly used as an adjective than
"check in".

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
---
 circ/returns.pl                                            | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/circ/returns.pl b/circ/returns.pl
index 3a235e9848..93f36f2130 100755
--- a/circ/returns.pl
+++ b/circ/returns.pl
@@ -225,7 +225,7 @@ if ($barcode) {
     # fix up item type for display
     $biblio->{'itemtype'} = C4::Context->preference('item-level_itypes') ? $biblio->{'itype'} : $biblio->{'itemtype'};
 
-    # Check if we should display a check in message, based on the the item
+    # Check if we should display a checkin message, based on the the item
     # type of the checked in item
     my $itemtype = C4::ItemType->get( $biblio->{'itemtype'} );
     if ( $itemtype->{'checkinmsg'} ) {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
index bbb6923026..860ed31b6a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
@@ -229,11 +229,11 @@ Item types administration
 		  <input type="text" id="rentalcharge" name="rentalcharge" size="10" value="[% rentalcharge %]" />
          </li>
       <li>
-          <label for="checkinmsg">Check in message: </label>
+          <label for="checkinmsg">Checkin message: </label>
           <textarea id="checkinmsg" name="checkinmsg" cols="55" rows="5">[% checkinmsg %]</textarea>
       </li>
       <li>
-          <label for="checkinmsgtype">Check in message type: </label>
+          <label for="checkinmsgtype">Checkin message type: </label>
           <select type="text" id="checkinmsgtype" name="checkinmsgtype">
               [% IF ( checkinmsgtype == 'message' ) %]
               <option value="message" selected="selected">Message</option>
@@ -301,7 +301,7 @@ Item types administration
     <th>Description</th>
     <th>Not for loan</th>
     <th>Charge</th>
-    <th>Check in message</th>
+    <th>Checkin message</th>
     <th>Actions</th>
   </thead>
   [% FOREACH loo IN loop %]
-- 
2.20.1