From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 18 Jun 2007 12:39:33 +0000 (+0000)
Subject: Udpated occur(r)ed
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=70d807d62c388e8830fab482ae7b8f9262f10278;p=gosa.git

Udpated occur(r)ed


git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.5@6616 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/include/class_ldap.inc b/include/class_ldap.inc
index e191657f3..de12ef2a4 100644
--- a/include/class_ldap.inc
+++ b/include/class_ldap.inc
@@ -589,7 +589,7 @@ class LDAP{
           }
 
           if($this->error != "Success"){
-            /* Some error occured */
+            /* Some error occurred */
             print "---------------------------------------------";
             print $this->get_error()."<br>";
             print $sourcedn."<br>";
diff --git a/include/functions.inc b/include/functions.inc
index 14e35c412..26fbf63ad 100644
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -1137,7 +1137,7 @@ function print_red()
             "position:absolute' id='e_layer'><table style='width:100%' summary='' border=0>".
             "<tr><td style='vertical-align:top;padding:10px'><img alt='' src='".
             get_template_path($img)."'></td>".
-            "<td style='width:100%'><h1>"._("An error occured while processing your request").
+            "<td style='width:100%'><h1>"._("An error occurred while processing your request").
             "</h1><b>$string</b><br><br>$addmsg</td></tr><tr><td colspan='2' align='center'><br><button ".
             (($_SESSION['js']==FALSE)?"type='submit'":"type='button'").
             " style='width:80px' onClick='hide(\"e_layer\")'>".
diff --git a/plugins/addons/ldapmanager/class_csvimport.inc b/plugins/addons/ldapmanager/class_csvimport.inc
index 86fee5fc4..1433c1231 100644
--- a/plugins/addons/ldapmanager/class_csvimport.inc
+++ b/plugins/addons/ldapmanager/class_csvimport.inc
@@ -143,7 +143,7 @@ class csvimport extends plugin
         /* row count */
         $tbl_rows   = $tbl_entries / $tblcolcount;
 
-        /* No error occured */
+        /* No error occurred */
         $failing = FALSE;
 
         /* For every row */
diff --git a/plugins/admin/fai/class_faiPartitionTable.inc b/plugins/admin/fai/class_faiPartitionTable.inc
index cd23610c2..c85cf9ab3 100644
--- a/plugins/admin/fai/class_faiPartitionTable.inc
+++ b/plugins/admin/fai/class_faiPartitionTable.inc
@@ -159,7 +159,7 @@ class faiPartitionTable extends plugin
     }
 
     /* Dialog saved
-     * Save given data from Dialog, if no error is occured
+     * Save given data from Dialog, if no error is occurred
      */
     if(isset($_POST['SaveDisk'])){
 
diff --git a/plugins/admin/systems/class_glpiAttachmentPool.inc b/plugins/admin/systems/class_glpiAttachmentPool.inc
index d36409ea5..e32c90d28 100644
--- a/plugins/admin/systems/class_glpiAttachmentPool.inc
+++ b/plugins/admin/systems/class_glpiAttachmentPool.inc
@@ -144,7 +144,7 @@ class glpiAttachmentPool extends plugin
                 }
               } // File already exists
             }
-          } // Check if any error occured
+          } // Check if any error occurred
         } // check if valid filename was uploaded
       } // ende check if file was uploaded 
     }// upload post