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 e191657f304f15345b4b32ae25d18adfb621023b..de12ef2a42395481df42a5b0a009114a8af6027a 100644 (file)
--- 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 14e35c412129f45d39be3fd464f75f96f715c4f7..26fbf63adbacefe7b90fb3541f2e67253f2dab55 100644 (file)
--- 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 86fee5fc4d16573451760383b7f13ba69e040f6c..1433c123173488b403fb214733a49ff9a8ac9f01 100644 (file)
--- 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 cd23610c2c15a7af5fea9bdb363c46df012aa53a..c85cf9ab33e11f49997054cfe9e286efffb82a78 100644 (file)
--- 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 d36409ea5f25dabe808c4ebccb1fe006c4d1ff3c..e32c90d2851bb6b896219a483a1ebb923c12fdf5 100644 (file)
--- 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