From 47d128d999b8142ec9c021c0f333f0e93356ab44 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 18 Jun 2007 12:36:52 +0000
Subject: [PATCH] Updated occur(r)ed

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@6615 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 html/setup.old                                     | 2 +-
 include/class_ldap.inc                             | 2 +-
 include/functions.inc                              | 2 +-
 plugins/addons/ldapmanager/class_csvimport.inc     | 2 +-
 plugins/admin/fai/class_faiPartitionTable.inc      | 2 +-
 plugins/admin/systems/class_glpiAttachmentPool.inc | 2 +-
 plugins/personal/generic/class_user.inc            | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/html/setup.old b/html/setup.old
index 3320ffd20..476555325 100644
--- 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 f3b1adb9e..3f8aa9959 100644
--- 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 144e03be0..45a4a2f3c 100644
--- 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 fcb5ef07a..95d96fd7a 100644
--- 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 7ac1a2917..2920d02bd 100644
--- 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 0d1ae07ff..0b04e02f6 100644
--- 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 c2f6a2f09..74b19cd1c 100644
--- 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"),
-- 
2.30.2