From 93eaf0252714fd8b9e55aaa59917b73a7de05c86 Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Sat, 27 Dec 2014 18:48:28 +0100 Subject: [PATCH] [PASSED QA] 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 I feel dirty signing this off, but I guess we have to be consistent in our language Signed-off-by: Kyle M Hall Fixed merge conflict by removing changed lines no longer needed. --- .../intranet-tmpl/prog/en/includes/strings.inc | 4 ++-- 1 files 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 312df74..20a0dad 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 @@