From 9921228f2a12de47d8e1fc85e936562c20a7abe4 Mon Sep 17 00:00:00 2001
From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Date: Mon, 16 Dec 2013 12:01:21 +0100
Subject: [PATCH] Bug 11398: A typo occurred with occured

This patch cures occured and makes occurred occur.
Note that I found them while testing bug 11170.
In a follow-up of 11170, I corrected this typo in parcels.tt.
This patch touches update22to30.pl and modborrowers.tt

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixes a typo in 2 files.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
---
 installer/data/mysql/update22to30.pl                          | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/installer/data/mysql/update22to30.pl b/installer/data/mysql/update22to30.pl
index 23d7a75708..f10ace95c5 100755
--- a/installer/data/mysql/update22to30.pl
+++ b/installer/data/mysql/update22to30.pl
@@ -3443,7 +3443,7 @@ my $DBversion = "3.00.00.000";
                 $dbh->do($sql);
                 if ($dbh->err) {
                     print "====================
-    An error occured during :
+    An error occurred during :
     \t$sql
     It probably means there is something wrong in your DB : a row ($table.$row->{key}) refers to a value in $row->{foreigntable}.$row->{foreignkey} that does not exist. solve the problem and run updater again (or just the previous SQL statement).
     You can find those values with select
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt
index 1e767577f7..a55dbd42b9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt
@@ -191,7 +191,7 @@
                     [% IF ( op == 'show_results' ) %]
                         [% IF ( errors ) %]
                             <div class="dialog alert">
-                            <h4>Errors occured:</h4>
+                            <h4>Errors occurred:</h4>
                             <ul class="warnings">
                             [% FOREACH error IN errors %]
                                 [% IF ( error.error == 'can_not_update' ) %]
-- 
2.39.5