Updated occur(r)ed

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

diff --git a/html/setup.old b/html/setup.old
index 3320ffd20fb4117e9a71921bedaddcf136c94bd6..476555325bdc8aa5ec67ecbf86ef1af5d2fd9989 100644 (file)
--- a/html/setup.old
+++ b/html/setup.old
@@ -53,7 +53,7 @@ if (!file_exists(CONFIG_TEMPLATE_DIR."/gosa.conf")){
        echo "error example of gosa.conf not present!";
 }
 
-// No Errors occured yet
+// No Errors occurred yet
 $_SESSION['errors']= "";
 $_SESSION['errors']             = "";
 $_SESSION['errorsAlreadyPosted']= array();

diff --git a/include/class_ldap.inc b/include/class_ldap.inc
index f3b1adb9e05c6de5cf85fbc9304dc9b29424d831..3f8aa9959cf965a35f965202c3cafa931a2ebf17 100644 (file)
--- a/include/class_ldap.inc
+++ b/include/class_ldap.inc
@@ -573,7 +573,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 144e03be0a55fd9569c3a8d1b7f4f5af1bf2397b..45a4a2f3c8653e13193a4a4b496b1e6439d4b563 100644 (file)
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -1069,7 +1069,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 fcb5ef07a67a9815e6d1cdf681aabd88efd8ec33..95d96fd7afedfe7a87119fb77cf75d7c99f56432 100644 (file)
--- a/plugins/addons/ldapmanager/class_csvimport.inc
+++ b/plugins/addons/ldapmanager/class_csvimport.inc
@@ -148,7 +148,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 7ac1a29175df45594d186243b5f23dff82c575ef..2920d02bd45fd066257522b93036bc03dfecd466 100644 (file)
--- a/plugins/admin/fai/class_faiPartitionTable.inc
+++ b/plugins/admin/fai/class_faiPartitionTable.inc
@@ -194,7 +194,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 0d1ae07ff97a01880517908c81bf59d62d6ca887..0b04e02f6b700c256436f6c11e34e79e10282e96 100644 (file)
--- a/plugins/admin/systems/class_glpiAttachmentPool.inc
+++ b/plugins/admin/systems/class_glpiAttachmentPool.inc
@@ -149,7 +149,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

diff --git a/plugins/personal/generic/class_user.inc b/plugins/personal/generic/class_user.inc
index c2f6a2f0910bb916821de6649094c6b021ea11a0..74b19cd1c5fd5a1966cd796db181717a88a15190 100644 (file)
--- a/plugins/personal/generic/class_user.inc
+++ b/plugins/personal/generic/class_user.inc
@@ -1403,7 +1403,7 @@ class user extends plugin
         "gouvernmentOrganizationalUnitDescription"  =>  _("Unit description"),
         "gouvernmentOrganizationalUnitSubjectArea"  =>  _("Subject area"),
         "functionalTitle"                           =>  _("Functional title"),
-        "certificateSerialNumber"                   =>  _(""),
+        "certificateSerialNumber"                   =>  _("Certificate serial number"),
         "publicVisible"                             =>  _("Public visible"),
         "street"                                    =>  _("Street"),
         "role"                                      =>  _("Role"),