From d23abaf0b836c8dfdfc1ad2dbeecd661c2cf6133 Mon Sep 17 00:00:00 2001
From: Katrin Fischer <Katrin.Fischer.83@web.de>
Date: Sat, 27 Dec 2014 18:48:28 +0100
Subject: [PATCH] Bug 13495: Use "checked in" instead of "returned" in
 circulation

To test:
- check out one or many items on a patron account
- return the items from the checkout table
- notice that a message "Checked in" is now shown
  in the first and last column, instead of "Returned"
  as before

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

I feel dirty signing this off, but I guess we have to be consistent in
our language

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Fixed merge conflict by removing changed lines no longer needed.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
---
 koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc
index 312df740c2..20a0dade36 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc
@@ -1,7 +1,7 @@
 <script type="text/javascript">
 //<![CDATA[
-    var CIRCULATION_RETURNED = _("Returned");
-    var CIRCULATION_NOT_RETURNED = _("Unable to return");
+    var CIRCULATION_RETURNED = _("Checked in");
+    var CIRCULATION_NOT_RETURNED = _("Unable to check in");
     var CIRCULATION_RENEWED_DUE = _("Renewed, due:");
     var CIRCULATION_RENEW_FAILED = _("Renew failed:");
     var NOT_CHECKED_OUT = _("not checked out");
-- 
2.39.5