Merge branch 'master' of github.com:svarshavchik/courier-libs

4 files changed, 6 insertions, 6 deletions

diff --git a/sqwebmail/html/en-us/eventshow.html b/sqwebmail/html/en-us/eventshow.html
index 27afc9a..696ff98 100644
--- a/sqwebmail/html/en-us/eventshow.html
+++ b/sqwebmail/html/en-us/eventshow.html
@@ -21,9 +21,9 @@
 
 [#$NOTFOUNDERR=<font style="color: #ff0000" size="+1" class="error">ERROR: Event not found.</font><br /><br />#]
 
-[#$CALENDARERR=<font style="color: #ff0000" size="+1" class="error">ERROR: An error has occured when updating the calendar: <div style="margin-left: 3.5em;"><span class="tt">%s</span></div></font><br /><br />#]
+[#$CALENDARERR=<font style="color: #ff0000" size="+1" class="error">ERROR: An error has occurred when updating the calendar: <div style="margin-left: 3.5em;"><span class="tt">%s</span></div></font><br /><br />#]
 
-[#$LOCKERR=<font style="color: #ff0000" size="+1" class="error">ERROR: An error has occured trying to lock the calendar.  Please try again.</font><br /><br />#]
+[#$LOCKERR=<font style="color: #ff0000" size="+1" class="error">ERROR: An error has occurred trying to lock the calendar.  Please try again.</font><br /><br />#]
 
 [#$CANCELIMAGE=@@cancel.png, width="28" height="20" alt="Cancel&nbsp;event" title="Cancel&nbsp;event" border="0"@@#]
 [#$UNCANCELIMAGE=@@uncancel.png, width="28" height="20" alt="Uncancel&nbsp;event" title="Uncancel&nbsp;event" border="0"@@#]
diff --git a/sqwebmail/html/en-us/folders.html b/sqwebmail/html/en-us/folders.html
index 3a0090a..aa1f13e 100644
--- a/sqwebmail/html/en-us/folders.html
+++ b/sqwebmail/html/en-us/folders.html
@@ -32,7 +32,7 @@
 [#$CALENDAR=<div class="eventsummarytitle" align="center"><a href="%s">Your Calendar</a></div>#]
 
 [#$NOEVENTS=<em>No upcoming calendar events</em>#]
-[#$CALENDARLOGINERR=The following error occured when trying to log in to the calendar server:#]
+[#$CALENDARLOGINERR=The following error occurred when trying to log in to the calendar server:#]
 [#$CANCELLED=CANCELLED:&nbsp;#]
 [#$BOOKED=PENDING:&nbsp;#]
 [#$PUBLICFOLDERS=<em>Public Folders</em>#]
diff --git a/sqwebmail/html/en-us/gpgerr.html b/sqwebmail/html/en-us/gpgerr.html
index 81924b2..257615f 100644
--- a/sqwebmail/html/en-us/gpgerr.html
+++ b/sqwebmail/html/en-us/gpgerr.html
@@ -56,7 +56,7 @@
 <!-- Sections. Folders, Create Messages, Preferences, Etc. -->
 [#include:navbar#]</div>
 
-<p>The following error has occured while encrypting or signing this
+<p>The following error has occurred while encrypting or signing this
 message:</p>
 
 <div style="margin-left: 3.5em;">
diff --git a/sqwebmail/html/en-us/newevent.html b/sqwebmail/html/en-us/newevent.html
index 0a82190..ca6ebf5 100644
--- a/sqwebmail/html/en-us/newevent.html
+++ b/sqwebmail/html/en-us/newevent.html
@@ -21,9 +21,9 @@
 
 [#$CONFLICTERR2=SCHEDULING CONFLICT:&nbsp;#]
 
-[#$CALENDARERR=<font style="color: #ff0000" size="+1" class="error">ERROR: The following error has occured when saving this event: <div style="margin-left: 3.5em;"><pre>%s</pre></div>If the calendar server is down, save/postpone this event, and try logging in again from the main menu.</font><br /><br />#]
+[#$CALENDARERR=<font style="color: #ff0000" size="+1" class="error">ERROR: The following error has occurred when saving this event: <div style="margin-left: 3.5em;"><pre>%s</pre></div>If the calendar server is down, save/postpone this event, and try logging in again from the main menu.</font><br /><br />#]
 
-[#$LOCKERR=<font style="color: #ff0000" size="+1" class="error">ERROR: An error has occured trying to lock the calendar for update.  Please try again.</font><br /><br />#]
+[#$LOCKERR=<font style="color: #ff0000" size="+1" class="error">ERROR: An error has occurred trying to lock the calendar for update.  Please try again.</font><br /><br />#]
 
 [#$NOTFOUNDERR=<font style="color: #ff0000" size="+1" class="error">ERROR: The original event was not found.  This can happen if this event was updated or modified by someone else.  Save this event info, and check your calendar for updates to this event.</font><br /><br />#]