From 07d4566096b1ca35ebc42ef5f5e73e63ec49924d Mon Sep 17 00:00:00 2001
From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 29 Jul 2010 16:21:26 +0000
Subject: [PATCH] Fixed spelling errors

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@19290 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 gosa-core/html/helpviewer.php                      |  4 ++--
 gosa-core/html/index.php                           |  4 ++--
 gosa-core/html/main.php                            |  2 +-
 gosa-core/html/password.php                        |  2 +-
 gosa-core/ihtml/themes/default/acl.tpl             |  4 ++--
 gosa-core/ihtml/themes/default/copyPasteDialog.tpl |  2 +-
 gosa-core/ihtml/themes/default/islocked.tpl        |  2 +-
 gosa-core/ihtml/themes/default/login.tpl           |  4 ++--
 gosa-core/ihtml/themes/default/msg_dialog.tpl      | 10 +++++-----
 gosa-core/ihtml/themes/default/sizelimit.tpl       |  2 +-
 gosa-core/ihtml/themes/default/snapshotdialog.tpl  |  4 ++--
 gosa-core/include/class_CopyPasteHandler.inc       |  2 +-
 gosa-core/include/class_acl.inc                    |  2 +-
 gosa-core/include/class_core.inc                   |  2 +-
 gosa-core/include/class_management.inc             |  4 ++--
 gosa-core/include/class_multi_plug.inc             |  2 +-
 gosa-core/include/functions_helpviewer.inc         |  2 +-
 gosa-core/include/php_setup.inc                    |  2 +-
 gosa-core/include/utils/class_msgPool.inc          |  2 +-
 .../addons/dyngroup/classDynamicLdapGroup.inc      |  2 +-
 .../addons/propertyEditor/class_propertyEditor.inc |  2 +-
 .../addons/propertyEditor/commandVerifier.tpl      |  4 ++--
 .../plugins/addons/propertyEditor/migrate.tpl      |  2 +-
 gosa-core/plugins/admin/acl/acl-list.xml           |  4 ++--
 gosa-core/plugins/admin/acl/acl_role.tpl           |  2 +-
 gosa-core/plugins/admin/acl/class_aclRole.inc      |  2 +-
 gosa-core/plugins/admin/acl/paste_role.tpl         |  2 +-
 .../plugins/admin/departments/dep_move_confirm.tpl |  2 +-
 gosa-core/plugins/admin/groups/class_group.inc     |  8 ++++----
 .../plugins/admin/groups/class_groupManagement.inc |  4 ++--
 gosa-core/plugins/admin/groups/generic.tpl         |  4 ++--
 gosa-core/plugins/admin/groups/paste_generic.tpl   |  4 ++--
 gosa-core/plugins/admin/ogroups/class_ogroup.inc   |  6 +++---
 .../plugins/generic/references/class_reference.inc |  2 +-
 gosa-core/plugins/personal/generic/class_user.inc  |  4 ++--
 gosa-core/plugins/personal/myaccount/main.inc      |  2 +-
 gosa-core/plugins/personal/password/changed.tpl    |  2 +-
 .../plugins/personal/password/class_password.inc   |  2 +-
 gosa-core/plugins/personal/posix/generic.tpl       |  2 +-
 gosa-core/plugins/personal/posix/paste_generic.tpl |  4 ++--
 gosa-core/setup/class_setupStep_Checks.inc         | 10 +++++-----
 gosa-core/setup/class_setupStep_Feedback.inc       |  6 +++---
 gosa-core/setup/class_setupStep_Finish.inc         |  2 +-
 gosa-core/setup/class_setupStep_Migrate.inc        | 14 +++++++-------
 gosa-core/setup/setup_checks.tpl                   |  4 ++--
 gosa-core/setup/setup_feedback.tpl                 |  4 ++--
 gosa-core/setup/setup_finish.tpl                   |  2 +-
 gosa-core/setup/setup_language.tpl                 |  2 +-
 gosa-core/setup/setup_ldap.tpl                     |  6 +++---
 gosa-core/setup/setup_license.tpl                  |  2 +-
 gosa-core/setup/setup_schema.tpl                   |  4 ++--
 gosa-core/setup/setup_welcome.tpl                  |  6 +++---
 52 files changed, 93 insertions(+), 93 deletions(-)

diff --git a/gosa-core/html/helpviewer.php b/gosa-core/html/helpviewer.php
index fa3b86694..1bcfa141c 100644
--- a/gosa-core/html/helpviewer.php
+++ b/gosa-core/html/helpviewer.php
@@ -115,7 +115,7 @@ if(session::global_is_set('current_class_for_help')){
   /* If there is no entry in the xml file for this class, display an error message */
   if($helpdir == ""){
     
-    $smarty->assign("help_contents","<br><h2>"._("There is no helpfile specified for this class"))."</h2>";
+    $smarty->assign("help_contents","<br><h2>"._("There is no help file specified for this class"))."</h2>";
     $header= "<!-- headers.tpl-->".$smarty->fetch(get_template_path('headers.tpl'));
     $display= (  $header.$smarty->fetch(get_template_path('help.tpl')));
     echo $display;
@@ -265,7 +265,7 @@ if(isset($_POST['search'])){
 }else{
   
   /* There was a file requested which actually doesn't exists */
-  $smarty->assign("help_contents","<h2>".sprintf(_("Helpdir '%s' is not accessible, can't read any helpfiles."),$helpdir))."</h2><br>";
+  $smarty->assign("help_contents","<h2>".sprintf(_("Help directory '%s' is not accessible, can't read any help files."),$helpdir))."</h2><br>";
   $header= "<!-- headers.tpl-->".$smarty->fetch(get_template_path('headers.tpl'));
   $display= (  $header.$smarty->fetch(get_template_path('help.tpl')));
   echo $display;
diff --git a/gosa-core/html/index.php b/gosa-core/html/index.php
index 152ba449c..ba0d1d530 100644
--- a/gosa-core/html/index.php
+++ b/gosa-core/html/index.php
@@ -69,7 +69,7 @@ function displayLogin()
 
     /* Displasy SSL mode warning? */
     if ($ssl != "" && $config->get_cfg_value("core",'warnSSL') == 'true') {
-        $smarty->assign("ssl", sprintf(_("This session is not ecrypted. Click %s to enter an encrypted session."), "<a href=\"$ssl\">".bold(_("here"))."</a>"));
+        $smarty->assign("ssl", sprintf(_("This session is not encrypted. Click %s to enter an encrypted session."), "<a href=\"$ssl\">".bold(_("here"))."</a>"));
     } else {
         $smarty->assign("ssl", "");
     }
@@ -286,7 +286,7 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces
     if (!$htaccess_authenticated) {
         $username= $_POST["username"];
         if (!preg_match("/^[@A-Za-z0-9_.-]+$/", $username)) {
-            $message= _("Please specify a valid username!");
+            $message= _("Please specify a valid user name!");
             $ok= false;
         } elseif (mb_strlen($_POST["password"], 'UTF-8') == 0) {
             $message= _("Please specify your password!");
diff --git a/gosa-core/html/main.php b/gosa-core/html/main.php
index 09dd56d22..07c69d1db 100644
--- a/gosa-core/html/main.php
+++ b/gosa-core/html/main.php
@@ -380,7 +380,7 @@ if (is_file("$plugin_dir/main.inc")){
   require ("$plugin_dir/main.inc");
 } else {
   msg_dialog::display(
-      _("Plugin"),
+      _("Plug-in"),
       sprintf(_("FATAL: Cannot find any plugin definitions for plugin %s!"), bold($plug)),
       FATAL_ERROR_DIALOG);
   exit();
diff --git a/gosa-core/html/password.php b/gosa-core/html/password.php
index 99a5d49cb..b42aadf81 100644
--- a/gosa-core/html/password.php
+++ b/gosa-core/html/password.php
@@ -250,7 +250,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['apply'])) {
         }
     }
     if(!passwordMethod::is_harmless($_POST['new_password'])){
-        $message[]= _("The password contains possibly problematic unicode characters!");
+        $message[]= _("The password contains possibly problematic Unicode characters!");
     }
 
     /* Validate */
diff --git a/gosa-core/ihtml/themes/default/acl.tpl b/gosa-core/ihtml/themes/default/acl.tpl
index d41f5733d..15ad1983b 100644
--- a/gosa-core/ihtml/themes/default/acl.tpl
+++ b/gosa-core/ihtml/themes/default/acl.tpl
@@ -20,12 +20,12 @@
         </td>
         <td>
           {if !$acl_writeable}
-            <select size="1" name="dummy_t" title="{t}Select an acl type{/t}" disabled>
+            <select size="1" name="dummy_t" title="{t}Select an ACL type{/t}" disabled>
               {html_options options=$aclTypes selected=$aclType}
               <option disabled>&nbsp;</option>
             </select>&nbsp;
           {else} 
-            <select size="1" name="aclType" title="{t}Select an acl type{/t}" onChange="document.mainform.submit()">
+            <select size="1" name="aclType" title="{t}Select an ACL type{/t}" onChange="document.mainform.submit()">
               {html_options options=$aclTypes selected=$aclType}
               <option disabled>&nbsp;</option>
             </select size=1>&nbsp;
diff --git a/gosa-core/ihtml/themes/default/copyPasteDialog.tpl b/gosa-core/ihtml/themes/default/copyPasteDialog.tpl
index b2399f861..66d751967 100644
--- a/gosa-core/ihtml/themes/default/copyPasteDialog.tpl
+++ b/gosa-core/ihtml/themes/default/copyPasteDialog.tpl
@@ -4,7 +4,7 @@
 <br>
 <br>
 {if $Complete == false}
-	{t}Some values need to be unique in the complete directory while some combinations make no sense. GOsa shows the relevant attributes. Please maintain the values below to fullfill the policies.{/t}
+	{t}Some values need to be unique in the complete directory while some combinations make no sense. GOsa shows the relevant attributes. Please maintain the values below to fulfill the policies.{/t}
 	<br>
 {t}Remember that some properties like taken snapshots will not be copied!{/t}&nbsp;
 {t}Or if you copy or cut an entry within GOsa and delete the source object, you may get errors while pasting this object again!{/t}
diff --git a/gosa-core/ihtml/themes/default/islocked.tpl b/gosa-core/ihtml/themes/default/islocked.tpl
index 566c1d432..b403b7087 100644
--- a/gosa-core/ihtml/themes/default/islocked.tpl
+++ b/gosa-core/ihtml/themes/default/islocked.tpl
@@ -11,7 +11,7 @@
  </p>
 
  <p>
-   {t}If this lock detection is false, the other person has obviously closed the webbrowser during the edit operation. You may want to take over the lock by pressing the 'Edit anyway' button.{/t}
+   {t}If this lock detection is false, the other person has obviously closed the web browser during the edit operation. You may want to take over the lock by pressing the 'Edit anyway' button.{/t}
  </p>
 
  <hr>
diff --git a/gosa-core/ihtml/themes/default/login.tpl b/gosa-core/ihtml/themes/default/login.tpl
index 60e02adea..d0f498bff 100644
--- a/gosa-core/ihtml/themes/default/login.tpl
+++ b/gosa-core/ihtml/themes/default/login.tpl
@@ -34,10 +34,10 @@
      <div class='login-box-container'>
        <div class='login-element-container'>
         <div style='background-color:green'>
-         <div class='login-label'><label for='username'>{t}Username{/t}</label></div>
+         <div class='login-label'><label for='username'>{t}User name{/t}</label></div>
          <div class='login-input'>
           <input type='text' name='username' maxlength='40' value='{$username}'
-            	 title='{t}Username{/t}' onFocus="nextfield= 'password';" />
+            	 title='{t}User name{/t}' onFocus="nextfield= 'password';" />
          </div>
         </div>
          <div class="clear"></div>
diff --git a/gosa-core/ihtml/themes/default/msg_dialog.tpl b/gosa-core/ihtml/themes/default/msg_dialog.tpl
index 6d8e4f24a..24ceb2b81 100644
--- a/gosa-core/ihtml/themes/default/msg_dialog.tpl
+++ b/gosa-core/ihtml/themes/default/msg_dialog.tpl
@@ -74,9 +74,9 @@
 				<tr>
 					<td colspan='2' align='center'>
 		{if $i_Type == $smarty.const.ERROR_DIALOG || $i_Type == $smarty.const.WARNING_DIALOG || $i_Type == $smarty.const.INFO_DIALOG}
-						<button type='submit' name='MSG_OK{$i_ID}'>{t}Ok{/t}</button> 
+						<button type='submit' name='MSG_OK{$i_ID}'>{t}OK{/t}</button> 
 		{elseif $buttononst.CONFIRM_DIALOG || $i_Type == $smarty.const.OK_CANCEL_DIALOG}
-						<button type='submit' name='MSG_OK{$i_ID}'>{t}Ok{/t}</button>
+						<button type='submit' name='MSG_OK{$i_ID}'>{t}OK{/t}</button>
 						<button type='submit' name='MSG_CANCEL{$i_ID}'>{t}Cancel{/t}</button>
 		{/if}
 					</td>
@@ -133,15 +133,15 @@
 					{/if}
 		{if $i_Type == $smarty.const.ERROR_DIALOG || $i_Type == $smarty.const.WARNING_DIALOG || $i_Type == $smarty.const.INFO_DIALOG}
 						<button id='MSG_OK{$i_ID}' type='button' name='MSG_OK{$i_ID}' 
-              onClick='next_msg_dialog();'>{t}Ok{/t}</button>
+              onClick='next_msg_dialog();'>{t}OK{/t}</button>
 		{elseif $i_Type == $smarty.const.CONFIRM_DIALOG}
 						<button id='MSG_OK{$i_ID}' type='submit' name='MSG_OK{$i_ID}' 
-              onClick='next_msg_dialog();'>{t}Ok{/t}</button>
+              onClick='next_msg_dialog();'>{t}OK{/t}</button>
 						<button type='button' name='MSG_CANCEL{$i_ID}' 
               onClick='next_msg_dialog();'>{t}Cancel{/t}</button>
 		{elseif $i_Type == $smarty.const.OK_CANCEL_DIALOG}
 						<button id='MSG_OK{$i_ID}' type='submit' name='MSG_OK{$i_ID}' 
-              onClick='next_msg_dialog();'>{t}Ok{/t}</button>
+              onClick='next_msg_dialog();'>{t}OK{/t}</button>
 						<button type='submit' name='MSG_CANCEL{$i_ID}' 
               onClick='next_msg_dialog();'>{t}Cancel{/t}</button>
 		{/if}
diff --git a/gosa-core/ihtml/themes/default/sizelimit.tpl b/gosa-core/ihtml/themes/default/sizelimit.tpl
index 7397de0c8..674a216b4 100644
--- a/gosa-core/ihtml/themes/default/sizelimit.tpl
+++ b/gosa-core/ihtml/themes/default/sizelimit.tpl
@@ -8,7 +8,7 @@
 <b>{t}Please choose the way to react for this session{/t}:</b>
 <p>
 <input type="radio" name="action" value="ignore">{t}ignore this error and show all entries the LDAP server returns{/t}<br>
-<input type="radio" name="action" value="limited" checked>{t}ignore this error and show all entries that fit into the defined sizelimit and let me use filters instead{/t}<br>
+<input type="radio" name="action" value="limited" checked>{t}ignore this error and show all entries that fit into the defined size limit and let me use filters instead{/t}<br>
 <input type="radio" name="action" value="newlimit">{$limit_message}
 </p>
 <hr>
diff --git a/gosa-core/ihtml/themes/default/snapshotdialog.tpl b/gosa-core/ihtml/themes/default/snapshotdialog.tpl
index c4524925a..f02ac79ca 100644
--- a/gosa-core/ihtml/themes/default/snapshotdialog.tpl
+++ b/gosa-core/ihtml/themes/default/snapshotdialog.tpl
@@ -6,7 +6,7 @@
 {t}This procedure will restore a snapshot of the selected object. It will replace the existing object after pressing the restore button.{/t}
 <br>
 <br>
-{t}Remember that DNS configuration and database entries could not be restored. For some objects it is only nescessary to open and save them again (goFon), but some entries must be recreated manually (glpi).{/t}
+{t}Remember that DNS configuration and database entries could not be restored. For some objects it is only necessary to open and save them again (goFon), but some entries must be recreated manually (glpi).{/t}
 <br>
 <br>
 {t}Don't forget to check references to other objects, for example does the selected printer still exists ?{/t}
@@ -68,7 +68,7 @@
 	</tr>
 	<tr>
 		<td>
-			<b>{t}Timestamp{/t}</b> 
+			<b>{t}Time stamp{/t}</b> 
 		</td>
 		<td> 
 		   {$CurrentDate}
diff --git a/gosa-core/include/class_CopyPasteHandler.inc b/gosa-core/include/class_CopyPasteHandler.inc
index 587cdcc90..25d4fa898 100644
--- a/gosa-core/include/class_CopyPasteHandler.inc
+++ b/gosa-core/include/class_CopyPasteHandler.inc
@@ -156,7 +156,7 @@ class CopyPasteHandler {
 
     /* Check if given dn is valid and ldap search was succesfull */ 
     if(!$res){
-      $msg= sprintf(_("Copy and paste failed!")."<br><br>"._("Error").": "._("'%s' is no vaild LDAP object"), bold(LDAP::fix($dn)));
+      $msg= sprintf(_("Copy and paste failed!")."<br><br>"._("Error").": "._("'%s' is no valid LDAP object"), bold(LDAP::fix($dn)));
       msg_dialog::display(_("Internal error"), $msg, ERROR_DIALOG);
       new log("copy","all/all",$dn,array(), $msg);
       return(FALSE);
diff --git a/gosa-core/include/class_acl.inc b/gosa-core/include/class_acl.inc
index 49f9853e4..296c2d1e4 100644
--- a/gosa-core/include/class_acl.inc
+++ b/gosa-core/include/class_acl.inc
@@ -975,7 +975,7 @@ class acl extends plugin
                 break;
 
             default:
-                msg_dialog::display(_("Internal error"), sprintf(_("Unkown ACL type '%s'!"), $type), ERROR_DIALOG);
+                msg_dialog::display(_("Internal error"), sprintf(_("Unknown ACL type '%s'!"), $type), ERROR_DIALOG);
                 $a= array();
         }
         return ($a);
diff --git a/gosa-core/include/class_core.inc b/gosa-core/include/class_core.inc
index eba2e040e..21a473127 100644
--- a/gosa-core/include/class_core.inc
+++ b/gosa-core/include/class_core.inc
@@ -232,7 +232,7 @@ class core extends plugin {
                             "name"          => "htaccessAuthentication",
                             "type"          => "bool",
                             "default"       => "false",
-                            "description"   => _("The 'htaccessAuthentication' variable tells GOsa to use either htaccess authentication or LDAP authentication. This can be used if you want to use i.e. kerberos to authenticate the users."),
+                            "description"   => _("The 'htaccessAuthentication' variable tells GOsa to use either htaccess authentication or LDAP authentication. This can be used if you want to use i.e. Kerberos to authenticate the users."),
                             "check"         => "gosaProperty::isBool",
                             "migrate"       => "",
                             "group"         => "authentification",
diff --git a/gosa-core/include/class_management.inc b/gosa-core/include/class_management.inc
index 48d1a5e03..a7d1fec84 100644
--- a/gosa-core/include/class_management.inc
+++ b/gosa-core/include/class_management.inc
@@ -632,7 +632,7 @@ class management
             $first  = $this->config->data['TABS'][$tabType][0];
             if(!class_available($first['CLASS'])){
                 msg_dialog::display(_("Internal error"),
-                        sprintf(_("Cannot instantiate tabbed-plugin, the base plugin (%s) is not available!"), $first['CLASS']),
+                        sprintf(_("Cannot instantiate tabbed-plug-in, the base plugin (%s) is not available!"), $first['CLASS']),
                         ERROR_DIALOG);
             }else{
                 $this->tabObject= new $tabClass($this->config,$this->config->data['TABS'][$tabType], $this->dn, $aclCategory);
@@ -716,7 +716,7 @@ class management
         $first  = $this->config->data['TABS'][$tabType][0];
         if(!class_available($first['CLASS'])){
             msg_dialog::display(_("Internal error"), 
-                    sprintf(_("Cannot instantiate tabbed-plugin, the base plugin (%s) is not available!"), $first['CLASS']), 
+                    sprintf(_("Cannot instantiate tabbed-plug-in, the base plugin (%s) is not available!"), $first['CLASS']), 
                     ERROR_DIALOG);
         }else{
             $this->tabObject= new $tab($this->config,$this->config->data['TABS'][$tabType], $this->dn,$aclCategory);
diff --git a/gosa-core/include/class_multi_plug.inc b/gosa-core/include/class_multi_plug.inc
index a6cbc9410..532adb157 100644
--- a/gosa-core/include/class_multi_plug.inc
+++ b/gosa-core/include/class_multi_plug.inc
@@ -359,7 +359,7 @@ class multi_plug
    */
   public function get_object_info()
   {
-    return(_("You are currently editing mutliple entries."));
+    return(_("You are currently editing multiple entries."));
   }
 
 
diff --git a/gosa-core/include/functions_helpviewer.inc b/gosa-core/include/functions_helpviewer.inc
index 437ffe12e..39739338e 100644
--- a/gosa-core/include/functions_helpviewer.inc
+++ b/gosa-core/include/functions_helpviewer.inc
@@ -85,7 +85,7 @@ function genIndex()
     if($exists){
       $str .= "<p style='padding-left:20px;'><a href='?plug=".$id."'><b>"._($name)."</b></a></p>";
     }else{
-      $str .= "<p style='padding-left:20px;'><b>"._($name)."</b> ("._("No help available for this plugin.").")</p>";
+      $str .= "<p style='padding-left:20px;'><b>"._($name)."</b> ("._("No help available for this plug-in.").")</p>";
     }
   }
   return (utf8_decode($str));
diff --git a/gosa-core/include/php_setup.inc b/gosa-core/include/php_setup.inc
index 2024321f3..515830aa6 100644
--- a/gosa-core/include/php_setup.inc
+++ b/gosa-core/include/php_setup.inc
@@ -101,7 +101,7 @@ function gosaRaiseError($errno, $errstr, $errfile, $errline)
            <td><span>"._("Generating this page caused the PHP interpreter to raise some errors!")."</span></td>
            <td align='right'>
             <a href=\"mailto:gosa-bugs@oss.gonicus.de?subject=GOsa%20bugreport&amp;body=%BUGBODY%\">
-                ".image('images/mailto.png')."&nbsp;"._("Send bugreport")."
+                ".image('images/mailto.png')."&nbsp;"._("Send bug report")."
             </a>
            </td>
            <td align='right'>
diff --git a/gosa-core/include/utils/class_msgPool.inc b/gosa-core/include/utils/class_msgPool.inc
index efd47aa0b..817c1b911 100644
--- a/gosa-core/include/utils/class_msgPool.inc
+++ b/gosa-core/include/utils/class_msgPool.inc
@@ -298,7 +298,7 @@ class msgPool
 
   public static function okButton()
   {
-    return sprintf(_("Ok"));
+    return sprintf(_("OK"));
   }
 
 
diff --git a/gosa-core/plugins/addons/dyngroup/classDynamicLdapGroup.inc b/gosa-core/plugins/addons/dyngroup/classDynamicLdapGroup.inc
index 28ed6cd89..60e7bb7d5 100644
--- a/gosa-core/plugins/addons/dyngroup/classDynamicLdapGroup.inc
+++ b/gosa-core/plugins/addons/dyngroup/classDynamicLdapGroup.inc
@@ -125,7 +125,7 @@ class DynamicLdapGroup extends plugin
             if(empty($entry['filter'])){
                 $messages[] = msgPool::required(_("Filter")." {$nr}");
             }elseif(!preg_match("/^\(/", $entry['filter'])){
-                $messages[] = msgPool::invalid(_("Filter")." {$nr}",  $entry['filter'],'', '(objectClass=gosaAccount)'." - "._("Surrounding brakets are required!"));
+                $messages[] = msgPool::invalid(_("Filter")." {$nr}",  $entry['filter'],'', '(objectClass=gosaAccount)'." - "._("Surrounding brackets are required!"));
             }else{
 
                 // Check if filter is valid
diff --git a/gosa-core/plugins/addons/propertyEditor/class_propertyEditor.inc b/gosa-core/plugins/addons/propertyEditor/class_propertyEditor.inc
index eac830beb..485f28609 100644
--- a/gosa-core/plugins/addons/propertyEditor/class_propertyEditor.inc
+++ b/gosa-core/plugins/addons/propertyEditor/class_propertyEditor.inc
@@ -4,7 +4,7 @@
 class propertyEditor extends management
 {
     var $plHeadline= "Preferences";
-    var $plDescription= "Configure global and special GOsa settings like hooks and plugin parameters";
+    var $plDescription= "Configure global and special GOsa settings like hooks and plug-in parameters";
     var $plIcon  = "plugins/propertyEditor/images/plugin.png";
 
     var $toBeMigrated = array();
diff --git a/gosa-core/plugins/addons/propertyEditor/commandVerifier.tpl b/gosa-core/plugins/addons/propertyEditor/commandVerifier.tpl
index 58f4b05dc..e48d80769 100644
--- a/gosa-core/plugins/addons/propertyEditor/commandVerifier.tpl
+++ b/gosa-core/plugins/addons/propertyEditor/commandVerifier.tpl
@@ -1,11 +1,11 @@
 <h3>{t}Command verifier{/t}</h3>
 <p>
- {t}Here you can execute commands in the way GOsa does and check the generated results or errors. This can be very usefull especially for the post events (postcreate, postmodify and postremove) due to the fact that these hook are executed silently.{/t}
+ {t}Here you can execute commands in the way GOsa does and check the generated results or errors. This can be very useful especially for the post events (postcreate, postmodify and postremove) due to the fact that these hook are executed silently.{/t}
 </p>
 
 <p>
  <b>
-  {t}Please be carefull here, all commands will really be executed on your machine and may break things!{/t}
+  {t}Please be careful here, all commands will really be executed on your machine and may break things!{/t}
  </b>
 </p>
 
diff --git a/gosa-core/plugins/addons/propertyEditor/migrate.tpl b/gosa-core/plugins/addons/propertyEditor/migrate.tpl
index ad601eaa7..12c9147aa 100644
--- a/gosa-core/plugins/addons/propertyEditor/migrate.tpl
+++ b/gosa-core/plugins/addons/propertyEditor/migrate.tpl
@@ -1,6 +1,6 @@
 <div id="mainlist">
  <div class="mainlist-header">
-  <p>{t}Property migration assistent{/t} - {t}Migration steps left{/t}: {$leftSteps}</p>
+  <p>{t}Property migration assistant{/t} - {t}Migration steps left{/t}: {$leftSteps}</p>
   <div class="mainlist-nav">
    <div style='width:100%; height: 400px; overflow: scroll; padding: 5px;'>
 
diff --git a/gosa-core/plugins/admin/acl/acl-list.xml b/gosa-core/plugins/admin/acl/acl-list.xml
index 777ecc4b7..09d9fcbeb 100644
--- a/gosa-core/plugins/admin/acl/acl-list.xml
+++ b/gosa-core/plugins/admin/acl/acl-list.xml
@@ -8,11 +8,11 @@
     <multiSelect>true</multiSelect>
     <template>acl-list.tpl</template>
     <module>acl</module>
-    <label>List of acls</label>
+    <label>List of ACLs</label>
     <defaultSortColumn>1</defaultSortColumn>
 
     <objectType>
-      <label>Acl</label>
+      <label>ACL</label>
       <objectClass>gosaAcl</objectClass>
       <category>acl</category>
       <class>acl</class>
diff --git a/gosa-core/plugins/admin/acl/acl_role.tpl b/gosa-core/plugins/admin/acl/acl_role.tpl
index 59e073168..8a8310b81 100644
--- a/gosa-core/plugins/admin/acl/acl_role.tpl
+++ b/gosa-core/plugins/admin/acl/acl_role.tpl
@@ -42,7 +42,7 @@
 {/if}
 
 {if $dialogState eq 'create'}
-<h3>{t}ACL type{/t} <select size="1" name="aclType" title="{t}Select an acl type{/t}" onChange="document.mainform.submit()">{html_options options=$aclTypes selected=$aclType}<option disabled>&nbsp;</option></select>&nbsp;{if $javascript eq 'false'}<button type='submit' name='refresh'>{msgPool type=applyButton}</button>{/if}
+<h3>{t}ACL type{/t} <select size="1" name="aclType" title="{t}Select an ACL type{/t}" onChange="document.mainform.submit()">{html_options options=$aclTypes selected=$aclType}<option disabled>&nbsp;</option></select>&nbsp;{if $javascript eq 'false'}<button type='submit' name='refresh'>{msgPool type=applyButton}</button>{/if}
 </h3>
 
 <hr>
diff --git a/gosa-core/plugins/admin/acl/class_aclRole.inc b/gosa-core/plugins/admin/acl/class_aclRole.inc
index c3b121fa8..439f0da3f 100644
--- a/gosa-core/plugins/admin/acl/class_aclRole.inc
+++ b/gosa-core/plugins/admin/acl/class_aclRole.inc
@@ -728,7 +728,7 @@ class aclrole extends acl
                   "name"          => "aclRoleRDN",
                   "type"          => "rdn",
                   "default"       => "ou=aclroles,",
-                  "description"   => _("The 'aclRoleRDN' statement defines the location where new acl roles will be created. The default is 'ou=aclroles,'."),
+                  "description"   => _("The 'aclRoleRDN' statement defines the location where new ACL roles will be created. The default is 'ou=aclroles,'."),
                   "check"         => "gosaProperty::isRdn",
                   "migrate"       => "migrate_aclRoleRDN",
                   "group"         => "plugin",
diff --git a/gosa-core/plugins/admin/acl/paste_role.tpl b/gosa-core/plugins/admin/acl/paste_role.tpl
index ea64774c6..ab4426a6c 100644
--- a/gosa-core/plugins/admin/acl/paste_role.tpl
+++ b/gosa-core/plugins/admin/acl/paste_role.tpl
@@ -1,4 +1,4 @@
-<table summary="{t}Paste acl-role{/t}">
+<table summary="{t}Paste ACL-role{/t}">
 	<tr>
 		<td>
 			{t}Name{/t}
diff --git a/gosa-core/plugins/admin/departments/dep_move_confirm.tpl b/gosa-core/plugins/admin/departments/dep_move_confirm.tpl
index 979c2062e..e48b4ace9 100644
--- a/gosa-core/plugins/admin/departments/dep_move_confirm.tpl
+++ b/gosa-core/plugins/admin/departments/dep_move_confirm.tpl
@@ -3,7 +3,7 @@
 
 </div>
 <p>
-{t}Modifying a departments naming attribute 'ou' or base may corrupt acls and snapshot entries for all entire objects.{/t}
+{t}Modifying a departments naming attribute 'ou' or base may corrupt ACLs and snapshot entries for all entire objects.{/t}
 </p>
 <p>
 {t}GOsa can NOT fix this for you, yet.{/t}
diff --git a/gosa-core/plugins/admin/groups/class_group.inc b/gosa-core/plugins/admin/groups/class_group.inc
index ce5ac4851..32db6fbb1 100644
--- a/gosa-core/plugins/admin/groups/class_group.inc
+++ b/gosa-core/plugins/admin/groups/class_group.inc
@@ -207,7 +207,7 @@ class group extends plugin
         $this->memberList->setEditable(false);
         $this->memberList->setWidth("100%");
         $this->memberList->setHeight("300px");
-        $this->memberList->setHeader(array('~',_("Given name"),_("Surename"),_("Uid")));
+        $this->memberList->setHeader(array('~',_("Given name"),_("Surename"),_("UID")));
         $this->memberList->setColspecs(array('20px','*','*','*','20px'));
         $this->memberList->setDefaultSortColumn(1);
 
@@ -307,7 +307,7 @@ class group extends plugin
         }
         $smarty->assign("sambaDomains",     set_post($domains));
         $smarty->assign("sambaDomainName",  set_post($this->sambaDomainName));
-        $groupTypes= array(0 => _("Samba group"), 512 => _("Domain admins"), 513 => _("Domain users"),
+        $groupTypes= array(0 => _("Samba group"), 512 => _("Domain administrators"), 513 => _("Domain users"),
                 514 => _("Domain guests"));
 
         /* Don't loose special groups! If not key'ed above, add it to
@@ -1167,7 +1167,7 @@ class group extends plugin
         $this->commonList->setEditable(false);
         $this->commonList->setWidth("100%");
         $this->commonList->setHeight("120px");
-        $this->commonList->setHeader(array('~',_("Given name"),_("Surename"),_("Uid")));
+        $this->commonList->setHeader(array('~',_("Given name"),_("Surename"),_("UID")));
         $this->commonList->setColspecs(array('20px','*','*','*','20px'));
         $this->commonList->setDefaultSortColumn(1);
 
@@ -1177,7 +1177,7 @@ class group extends plugin
         $this->partialList->setEditable(false);
         $this->partialList->setWidth("100%");
         $this->partialList->setHeight("120px");
-        $this->partialList->setHeader(array('~',_("Given name"),_("Surename"),_("Uid")));
+        $this->partialList->setHeader(array('~',_("Given name"),_("Surename"),_("UID")));
         $this->partialList->setColspecs(array('20px','*','*','*','20px'));
         $this->partialList->setDefaultSortColumn(1);
     }
diff --git a/gosa-core/plugins/admin/groups/class_groupManagement.inc b/gosa-core/plugins/admin/groups/class_groupManagement.inc
index c190df15f..4c217fa1c 100644
--- a/gosa-core/plugins/admin/groups/class_groupManagement.inc
+++ b/gosa-core/plugins/admin/groups/class_groupManagement.inc
@@ -154,8 +154,8 @@ class groupManagement extends management
                 array(
                     "image" => "plugins/groups/images/select_group.png",
                     "plugin" => "group",
-                    "alt" => _("Posix"),
-                    "title" => _("Edit posix properties")
+                    "alt" => _("POSIX"),
+                    "title" => _("Edit POSIX properties")
                     ),
 
                 "gosaMailAccount" => 
diff --git a/gosa-core/plugins/admin/groups/generic.tpl b/gosa-core/plugins/admin/groups/generic.tpl
index 5de3def4c..70191167f 100644
--- a/gosa-core/plugins/admin/groups/generic.tpl
+++ b/gosa-core/plugins/admin/groups/generic.tpl
@@ -14,7 +14,7 @@
 	<input type='text' id="dummy1" name="dummy1" size=25 maxlength=60 value="{t}Multiple edit{/t}" disabled>
 {else}
 {render acl=$cnACL}
-       <input type='text' id="cn" name="cn" size=25 maxlength=60 value="{$cn}" title="{t}Posix name of the group{/t}">
+       <input type='text' id="cn" name="cn" size=25 maxlength=60 value="{$cn}" title="{t}POSIX name of the group{/t}">
 {/render}
 {/if}
      </td>
@@ -56,7 +56,7 @@
     <tr>
      <td colspan=2>
 {render acl=$gidNumberACL}
-      <input type=checkbox name="force_gid" value="1" title="{t}Normally IDs are autogenerated, select to specify manually{/t}" 
+      <input type=checkbox name="force_gid" value="1" title="{t}Normally IDs are auto-generated, select to specify manually{/t}" 
 	{$force_gid} onclick="changeState('gidNumber')">
 {/render}
 	<LABEL for="gidNumber">{t}Force GID{/t}</LABEL>
diff --git a/gosa-core/plugins/admin/groups/paste_generic.tpl b/gosa-core/plugins/admin/groups/paste_generic.tpl
index 754eec478..499acba81 100644
--- a/gosa-core/plugins/admin/groups/paste_generic.tpl
+++ b/gosa-core/plugins/admin/groups/paste_generic.tpl
@@ -5,12 +5,12 @@
 			{t}Group name{/t}
 		</td>
 		<td>
-			<input type='text' id='cn' name='cn' size='35' maxlength='60' value='{$cn}' title='{t}Posix name of the group{/t}'>
+			<input type='text' id='cn' name='cn' size='35' maxlength='60' value='{$cn}' title='{t}POSIX name of the group{/t}'>
 		</td>
 	</tr>
 	<tr>
 		<td>
-			<input type=checkbox name='force_gid' value='1' {$used} title='{t}Normally IDs are autogenerated, select to specify manually{/t}' 
+			<input type=checkbox name='force_gid' value='1' {$used} title='{t}Normally IDs are auto-generated, select to specify manually{/t}' 
 				onclick='changeState("gidNumber")'>
 			<LABEL for='gidNumber'>{t}Force GID{/t}</LABEL>
 		</td>
diff --git a/gosa-core/plugins/admin/ogroups/class_ogroup.inc b/gosa-core/plugins/admin/ogroups/class_ogroup.inc
index 9f15817e6..69b32e23f 100644
--- a/gosa-core/plugins/admin/ogroups/class_ogroup.inc
+++ b/gosa-core/plugins/admin/ogroups/class_ogroup.inc
@@ -323,7 +323,7 @@ class ogroup extends plugin
                     "D" => _("departments"),
                     "S" => _("servers"),
                     "W" => _("workstations"),
-                    "O" => _("winstations"),
+                    "O" => _("Windows workstations"),
                     "T" => _("terminals"),
                     "F" => _("phones"),
                     "P" => _("printers"));
@@ -528,7 +528,7 @@ class ogroup extends plugin
 
             /* It has failed, add entry with type flag I (Invalid)*/
             if (!$ldap->success()){
-                $this->memberList[$dn]= array('text' => _("Non existing dn:")." ".LDAP::fix($dn),"type" => "I");
+                $this->memberList[$dn]= array('text' => _("Non existing DN:")." ".LDAP::fix($dn),"type" => "I");
 
             } else {
 
@@ -840,7 +840,7 @@ class ogroup extends plugin
                         "cn"                => _("Name"),
                         "base"              => _("Base"),
                         "description"       => _("Description"),
-                        "accessTo"          => _("Sytem trust"),
+                        "accessTo"          => _("System trust"),
                         "member"            => _("Member"))
                     ));
     }
diff --git a/gosa-core/plugins/generic/references/class_reference.inc b/gosa-core/plugins/generic/references/class_reference.inc
index 11a5383b9..f79dec13c 100644
--- a/gosa-core/plugins/generic/references/class_reference.inc
+++ b/gosa-core/plugins/generic/references/class_reference.inc
@@ -84,7 +84,7 @@ class reference extends plugin
         // Check for user manager 
         $this->referenceFilters[] = array(
             'filter' => "(&(objectClass=gosaAccount)(manager=".normalizeLdap($this->dn)."))",
-            'attrs'  => array('givenName' => _("Given name"),'sn' => _("Surname"),'uid'=>_("Uid")),
+            'attrs'  => array('givenName' => _("Given name"),'sn' => _("Surname"),'uid'=>_("UID")),
             'msg'    => _("User manager"));
 
         // Go through filters and detect possible references  
diff --git a/gosa-core/plugins/personal/generic/class_user.inc b/gosa-core/plugins/personal/generic/class_user.inc
index f66b36acb..50d0fd538 100644
--- a/gosa-core/plugins/personal/generic/class_user.inc
+++ b/gosa-core/plugins/personal/generic/class_user.inc
@@ -294,7 +294,7 @@ class user extends plugin
           preg_match('/^([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)\/([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)$/', $val)) {
         $this->gosaLoginRestrictionWidget->addEntry($val);
       } else {
-        msg_dialog::display(_("Error"), _("Please add a single IP address or a network/netmask combination!"), ERROR_DIALOG);
+        msg_dialog::display(_("Error"), _("Please add a single IP address or a network/net mask combination!"), ERROR_DIALOG);
       }
     }
 
@@ -1740,7 +1740,7 @@ class user extends plugin
           "employeeType"      => _("Employee type"),
 
           "roomNumber"        => _("Room number"),
-          "telephoneNumber"   => _("Telefon number"),
+          "telephoneNumber"   => _("Telephone number"),
           "pager"             => _("Pager number"),
           "mobile"            => _("Mobile number"),
           "facsimileTelephoneNumber"     => _("Fax number"),
diff --git a/gosa-core/plugins/personal/myaccount/main.inc b/gosa-core/plugins/personal/myaccount/main.inc
index 45d0438c1..c591fc7b5 100644
--- a/gosa-core/plugins/personal/myaccount/main.inc
+++ b/gosa-core/plugins/personal/myaccount/main.inc
@@ -50,7 +50,7 @@ if (! $cleanup ){
         $first  = $config->data['TABS']['MYACCOUNTTABS'][0];
         if(!class_available($first['CLASS'])){
             msg_dialog::display(_("Internal error"),
-                    sprintf(_("Cannot instantiate tabbed-plugin, the base plugin (%s) is not available!"), $first['CLASS']),
+                    sprintf(_("Cannot instantiate tabbed-plug-in, the base plugin (%s) is not available!"), $first['CLASS']),
                     ERROR_DIALOG);
         }else{
 
diff --git a/gosa-core/plugins/personal/password/changed.tpl b/gosa-core/plugins/personal/password/changed.tpl
index 896501604..a64cccd82 100644
--- a/gosa-core/plugins/personal/password/changed.tpl
+++ b/gosa-core/plugins/personal/password/changed.tpl
@@ -1,6 +1,6 @@
 
 <p>
- <b>{t}You've successfully changed your password. Remember to change all programms configured to use it as well.{/t}</b>
+ <b>{t}You've successfully changed your password. Remember to change all programs configured to use it as well.{/t}</b>
 </p>
 
 <br>
diff --git a/gosa-core/plugins/personal/password/class_password.inc b/gosa-core/plugins/personal/password/class_password.inc
index ccd30a18f..d293183a9 100644
--- a/gosa-core/plugins/personal/password/class_password.inc
+++ b/gosa-core/plugins/personal/password/class_password.inc
@@ -139,7 +139,7 @@ class password extends plugin
                         _("The password used as new is to short."),WARNING_DIALOG);
             }elseif(!passwordMethod::is_harmless($new_password)){
                 msg_dialog::display(_("Password change"),
-                        _("The password contains possibly problematic unicode characters!"),WARNING_DIALOG);
+                        _("The password contains possibly problematic Unicode characters!"),WARNING_DIALOG);
             }elseif($check_hook && $check_hook_output != ""){
                 msg_dialog::display(_("Password change"),
                         sprintf(_("External password changer reported a problem: %s."),$check_hook_output),WARNING_DIALOG);
diff --git a/gosa-core/plugins/personal/posix/generic.tpl b/gosa-core/plugins/personal/posix/generic.tpl
index d9de0b94b..e260263bc 100644
--- a/gosa-core/plugins/personal/posix/generic.tpl
+++ b/gosa-core/plugins/personal/posix/generic.tpl
@@ -39,7 +39,7 @@
     </tr>
     {if $gotoLastSystemLogin}
     <tr>
-     <td>{t}Last logon{/t}</td>
+     <td>{t}Last log-on{/t}</td>
      <td>{$gotoLastSystemLogin}</td>
     </tr>
     {/if}
diff --git a/gosa-core/plugins/personal/posix/paste_generic.tpl b/gosa-core/plugins/personal/posix/paste_generic.tpl
index 9ecbb7c42..7ce503598 100644
--- a/gosa-core/plugins/personal/posix/paste_generic.tpl
+++ b/gosa-core/plugins/personal/posix/paste_generic.tpl
@@ -1,8 +1,8 @@
-<table width='100%' summary="{t}Posix settings{/t}">
+<table width='100%' summary="{t}POSIX settings{/t}">
  <tr>
   <td style='width:50%;' class='right-border'>
 
-   <h3>{t}Posix settings{/t}</h3>
+   <h3>{t}POSIX settings{/t}</h3>
    <table summary="{t}Home directory{/t}">
     <tr>
      <td>
diff --git a/gosa-core/setup/class_setupStep_Checks.inc b/gosa-core/setup/class_setupStep_Checks.inc
index 67336dd70..783ba98fd 100644
--- a/gosa-core/setup/class_setupStep_Checks.inc
+++ b/gosa-core/setup/class_setupStep_Checks.inc
@@ -112,7 +112,7 @@ class Step_Checks extends setup_step
 
     /* Is imap module available */
     $N = msgPool::checkingFor(_("mbstring"));
-    $D = _("GOsa requires this module to handle unicode strings.");
+    $D = _("GOsa requires this module to handle Unicode strings.");
     $S = msgPool::installPhpModule("mbstring");
     $R = is_callable("mb_strlen");
     $M = TRUE;
@@ -147,7 +147,7 @@ class Step_Checks extends setup_step
 
     $N = msgPool::checkingFor(_("samba hash generator"));
     $D = _("GOsa requires this command to synchronize POSIX and samba passwords.");
-    $S = _("Deploy a gosa-si installation or install the perl Crypt::SmbHash modules.");
+    $S = _("Deploy a gosa-si installation or install the Perl Crypt::SmbHash modules.");
     $R = $have_mkntpwd;
     $M = TRUE;
     $this->basic_checks[] = array("NAME" => $N , "DESC" => $D , "RESULT" => $R , "SOLUTION" => $S , "MUST" => $M );
@@ -215,7 +215,7 @@ class Step_Checks extends setup_step
 
     /* Check if memory limit is set to 32 or > */
     $N = "memory_limit &gt;= <b>32</b>";
-    $D = _("GOsa needs at least 32MB of memory. Setting it below this limit may cause errors that are not reproducable! Increase it for larger setups.");
+    $D = _("GOsa needs at least 32MB of memory. Setting it below this limit may cause errors that are not reproducible! Increase it for larger setups.");
     $S = _("Search for 'memory_limit' in your php.ini and set it to '32M' or higher.");
     $R = ini_get('memory_limit') >= 32 ;
     $M = TRUE;
@@ -266,9 +266,9 @@ class Step_Checks extends setup_step
      */
 
     /* Check if we can create a config file.*/
-    $N = _("Configuration writeable");
+    $N = _("Configuration writable");
     $D = _("The configuration file can't be written");
-    $S = sprintf(_("GOsa reads its configuration from a file located in (%s/%s). The setup can write the configuration directly if it is writeable."),CONFIG_DIR,CONFIG_FILE); 
+    $S = sprintf(_("GOsa reads its configuration from a file located in (%s/%s). The setup can write the configuration directly if it is writable."),CONFIG_DIR,CONFIG_FILE); 
     $R =    ( file_exists(CONFIG_DIR."/".CONFIG_FILE) && is_writeable(CONFIG_DIR."/".CONFIG_FILE)) // is there a config file ? 
         ||  (!file_exists(CONFIG_DIR."/".CONFIG_FILE) && is_writeable(CONFIG_DIR));  // There is non, but can we create a file there ?
     $M = FALSE;
diff --git a/gosa-core/setup/class_setupStep_Feedback.inc b/gosa-core/setup/class_setupStep_Feedback.inc
index 99055a3c3..87fb74788 100644
--- a/gosa-core/setup/class_setupStep_Feedback.inc
+++ b/gosa-core/setup/class_setupStep_Feedback.inc
@@ -95,7 +95,7 @@ class Step_Feedback  extends setup_step
         $this->features_used['samba']       = array("USED" => isset($oc['sambaSamAccount']) || isset($oc['sambaAccount']) , 
                 "NAME" => _("Samba management"));
         $this->features_used['mail']        = array("USED" => FALSE,
-                "NAME" => _("Mailsystem management"));
+                "NAME" => _("Mail system management"));
         $this->features_used['fax']         = array("USED" => isset($oc['goFaxAccount']) , 
                 "NAME" => _("FAX system administration"));
         $this->features_used['asterisk']    = array("USED" => isset($oc['goFonAccount']), 
@@ -103,9 +103,9 @@ class Step_Feedback  extends setup_step
         $this->features_used['inventory']   = array("USED" => isset($oc['glpiAccount']) , 
                 "NAME" => _("System inventory"));
         $this->features_used['system']      = array("USED" => FALSE , 
-                "NAME" => _("System-/Configmanagement"));
+                "NAME" => _("System/Configuration management"));
         $this->features_used['addressbook'] = array("USED" => FALSE , 
-                "NAME" => _("Addressbook"));
+                "NAME" => _("Address book"));
     }
 
 
diff --git a/gosa-core/setup/class_setupStep_Finish.inc b/gosa-core/setup/class_setupStep_Finish.inc
index aa787833c..a4c2da751 100644
--- a/gosa-core/setup/class_setupStep_Finish.inc
+++ b/gosa-core/setup/class_setupStep_Finish.inc
@@ -114,7 +114,7 @@ class Step_Finish extends setup_step
     $smarty->assign("CONFIG_DIR",CONFIG_DIR);
     $smarty->assign("CONFIG_FILE" , CONFIG_FILE);
 
-    $smarty->assign("msg2", sprintf(_("After downloading and placing the file under %s, please make sure that the user the webserver is running with is able to read %s, while other users shouldn't. You may want to execute these commands to achieve this requirement:"),CONFIG_DIR,CONFIG_FILE));
+    $smarty->assign("msg2", sprintf(_("After downloading and placing the file under %s, please make sure that the user the web server is running with is able to read %s, while other users shouldn't. You may want to execute these commands to achieve this requirement:"),CONFIG_DIR,CONFIG_FILE));
 
     $smarty->assign("cv",$this->parent->captured_values);
     return($smarty -> fetch (get_template_path("../setup/setup_finish.tpl")));
diff --git a/gosa-core/setup/class_setupStep_Migrate.inc b/gosa-core/setup/class_setupStep_Migrate.inc
index 2dc738586..843609397 100644
--- a/gosa-core/setup/class_setupStep_Migrate.inc
+++ b/gosa-core/setup/class_setupStep_Migrate.inc
@@ -131,7 +131,7 @@ class Step_Migrate extends setup_step
             $this->checks['permissions']['STATUS']    = FALSE;
             $this->checks['permissions']['STATUS_MSG']= _("Failed");
             $this->checks['permissions']['ERROR_MSG'] = 
-                sprintf(_("The specified user '%s' does not have full access to your ldap database."),$cv['admin']);
+                sprintf(_("The specified user '%s' does not have full access to your LDAP database."),$cv['admin']);
             return(false);
         }
 
@@ -144,13 +144,13 @@ class Step_Migrate extends setup_step
             $this->checks['permissions']['STATUS']    = FALSE;
             $this->checks['permissions']['STATUS_MSG']= _("Failed");
             $this->checks['permissions']['ERROR_MSG'] = 
-                sprintf(_("The specified user '%s' does not have full access to your ldap database."),$cv['admin']);
+                sprintf(_("The specified user '%s' does not have full access to your LDAP database."),$cv['admin']);
             return(false);
         }
 
         /* Create & remove of dummy object was successful */
         $this->checks['permissions']['STATUS']    = TRUE;
-        $this->checks['permissions']['STATUS_MSG']= _("Ok");
+        $this->checks['permissions']['STATUS_MSG']= _("OK");
         $this->checks['permissions']['ERROR_MSG'] = "";
         return(true);
     } 
@@ -300,7 +300,7 @@ class Step_Migrate extends setup_step
                     $str.= "<b>"._("Groups")."</b>:&nbsp;".trim($valid_groups,", ")."<br>";
                 }
                 $this->checks['acls']['STATUS']    = TRUE;
-                $this->checks['acls']['STATUS_MSG']= _("Ok");
+                $this->checks['acls']['STATUS_MSG']= _("OK");
                 $this->checks['acls']['ERROR_MSG'] = $str;
             }else{
                 $this->checks['acls']['STATUS']    = FALSE;
@@ -412,7 +412,7 @@ class Step_Migrate extends setup_step
         $ldap->cd($cv['base']);
         $ldap->search("(uid=".$uid.")");
         if($ldap->count()){
-            msg_dialog::display(_("Input error"),msgPool::duplicated(_("Uid")), ERROR_DIALOG);
+            msg_dialog::display(_("Input error"),msgPool::duplicated(_("UID")), ERROR_DIALOG);
             return false;
         }
 
@@ -681,7 +681,7 @@ class Step_Migrate extends setup_step
 
         /* Create & remove of dummy object was successful */
         $this->checks['root']['STATUS']    = TRUE;
-        $this->checks['root']['STATUS_MSG']= _("Ok");
+        $this->checks['root']['STATUS_MSG']= _("OK");
     }
 
 
@@ -825,7 +825,7 @@ class Step_Migrate extends setup_step
 
         /* Create & remove of dummy object was successful */
         $this->checks['rootOC']['STATUS']    = TRUE;
-        $this->checks['rootOC']['STATUS_MSG']= _("Ok");
+        $this->checks['rootOC']['STATUS_MSG']= _("OK");
         $this->checks['rootOC']['ERROR_MSG'] = "";
     }
 
diff --git a/gosa-core/setup/setup_checks.tpl b/gosa-core/setup/setup_checks.tpl
index ab1dca664..14d25e2f9 100644
--- a/gosa-core/setup/setup_checks.tpl
+++ b/gosa-core/setup/setup_checks.tpl
@@ -18,7 +18,7 @@
      <td>{$basic[$key].NAME}</td>
 
      {if $basic[$key].RESULT}
-       <td style='color:#0A0'>{t}Ok{/t}</td>
+       <td style='color:#0A0'>{t}OK{/t}</td>
       </tr>
      {else}
         {if $basic[$key].MUST}
@@ -59,7 +59,7 @@
      <td>{$config[$key].NAME}</td>
 
      {if $config[$key].RESULT}
-       <td style='color:#0A0'>{t}Ok{/t}</td>
+       <td style='color:#0A0'>{t}OK{/t}</td>
       </tr>
      {else}
         {if $config[$key].MUST}
diff --git a/gosa-core/setup/setup_feedback.tpl b/gosa-core/setup/setup_feedback.tpl
index 5fdebc253..f6f103bce 100644
--- a/gosa-core/setup/setup_feedback.tpl
+++ b/gosa-core/setup/setup_feedback.tpl
@@ -1,9 +1,9 @@
 {if $feedback_send}
-	<font color='green'>{t}Feedback sucessfully send{/t}</font>
+	<font color='green'>{t}Feedback successfully send{/t}</font>
 {else}
 	
     <input {if $subscribe} checked {/if} type='checkbox' name='subscribe' value='1' class='center'>
-    {t}Subscribe to the gosa-announce mailinglist{/t}
+    {t}Subscribe to the gosa-announce mailing list{/t}
 
     <p>{t}When checking this option, GOsa will try to connect http://oss.gonicus.de in order to subscribe you to the gosa-announce mailing list. You've to confirm this by mail.{/t}</p>
 
diff --git a/gosa-core/setup/setup_finish.tpl b/gosa-core/setup/setup_finish.tpl
index 9d7597f29..b723115fc 100644
--- a/gosa-core/setup/setup_finish.tpl
+++ b/gosa-core/setup/setup_finish.tpl
@@ -7,7 +7,7 @@
 	</p>
 
       {if $webgroup == ""}
-{t}Depending on the user name your webserver is running on:{/t}
+{t}Depending on the user name your web server is running on:{/t}
 <tt>
 <pre> chown root:www-data {$CONFIG_DIR}/{$CONFIG_FILE}
  chmod 640 {$CONFIG_DIR}/{$CONFIG_FILE}
diff --git a/gosa-core/setup/setup_language.tpl b/gosa-core/setup/setup_language.tpl
index 236ce1651..668181685 100644
--- a/gosa-core/setup/setup_language.tpl
+++ b/gosa-core/setup/setup_language.tpl
@@ -2,7 +2,7 @@
 	<div class='default'>
 		<p><b>{t}Please select the preferred language{/t}</b></p>
 		<p>
-		{t}At this point, you can select the site wide default language. Choosing 'automatic' will use the language requested by the browser. This setting can be overriden per user.{/t}
+		{t}At this point, you can select the site wide default language. Choosing 'automatic' will use the language requested by the browser. This setting can be overridden per user.{/t}
 		</p>
 	</div>
 	<div class='default' style='padding-right:10px; margin-bottom:20px;'>
diff --git a/gosa-core/setup/setup_ldap.tpl b/gosa-core/setup/setup_ldap.tpl
index 97e254cbc..df28d1f97 100644
--- a/gosa-core/setup/setup_ldap.tpl
+++ b/gosa-core/setup/setup_ldap.tpl
@@ -63,7 +63,7 @@
 	<b>{t}Authentication{/t}</b>
     <table style='width:100%' summary='{t}Authentication{/t}'>
         <tr>
-            <td style='width:200px;'>{t}Admin DN{/t}</td>
+            <td style='width:200px;'>{t}Administrator DN{/t}</td>
             <td>
                 <input type='text' name='admin_given' maxlength='160' size='40' value='{$admin_given}'>
 			    {if $append_base_to_admin_dn},{$base_to_append}{/if}
@@ -78,7 +78,7 @@
                 <input onClick='document.mainform.submit();' 
                     {if $append_base_to_admin_dn} checked {/if} 
                     type='checkbox' name='append_base_to_admin_dn' value='1'>&nbsp;
-                {t}Automatically append LDAP base to admin DN{/t}
+                {t}Automatically append LDAP base to administrator DN{/t}
             </td>
         </tr>
         <tr>
@@ -91,7 +91,7 @@
 	<b>{t}Schema based settings{/t}</b>
     <table style='width:100%' summary='{t}Schema based settings{/t}'>
         <tr>
-            <td style='width:200px;'>{t}Use rfc2307bis compliant groups{/t}</td>
+            <td style='width:200px;'>{t}Use RFC 2307bis compliant groups{/t}</td>
             <td>
                 <select name="rfc2307bis" size="1" title="">
                    {html_options options=$bool selected=$rfc2307bis}
diff --git a/gosa-core/setup/setup_license.tpl b/gosa-core/setup/setup_license.tpl
index c9a0a9144..7b65e2804 100644
--- a/gosa-core/setup/setup_license.tpl
+++ b/gosa-core/setup/setup_license.tpl
@@ -1,6 +1,6 @@
 <div>
  <p>
-  {t}GOsa is developed under the terms of the GNU General Public Licence V2. Please accept the terms below.{/t}
+  {t}GOsa is developed under the terms of the GNU General Public License v2. Please accept the terms below.{/t}
  </p>
 	<div class='default' style='margin:10px; border:1px solid #A0A0A0'>
 		<div style='height:450px;padding:5px;overflow:auto; '>
diff --git a/gosa-core/setup/setup_schema.tpl b/gosa-core/setup/setup_schema.tpl
index b9fdbb7c6..1b0de2e13 100644
--- a/gosa-core/setup/setup_schema.tpl
+++ b/gosa-core/setup/setup_schema.tpl
@@ -8,9 +8,9 @@
 
  {if $ocCount == 0}
   <p>
-   {t}Could not read any schema informations, all checks skipped. Adjust your ldap acls.{/t}
+   {t}Could not read any schema information, all checks skipped. Adjust your LDAP ACLs.{/t}
    {if !$database_initialised}
-    {t}It seems that your ldap database wasn't initialized yet. This maybe the reason, why GOsa can't read your schema configuration!{/t}
+    {t}It seems that your LDAP database wasn't initialized yet. This maybe the reason, why GOsa can't read your schema configuration!{/t}
    {/if}
   </p>
  {else}
diff --git a/gosa-core/setup/setup_welcome.tpl b/gosa-core/setup/setup_welcome.tpl
index 7fad847b8..861155a97 100644
--- a/gosa-core/setup/setup_welcome.tpl
+++ b/gosa-core/setup/setup_welcome.tpl
@@ -2,7 +2,7 @@
     <div class='default'>
 	<h2>{t}How to get started{/t}</h2>
 	<p>
-	{t}This seems to be the first time you run GOsa on this system. To start the GOsa web interface you need a working configuration file, which can be generated by this wizzard.{/t}
+	{t}This seems to be the first time you run GOsa on this system. To start the GOsa web interface you need a working configuration file, which can be generated by this wizard.{/t}
 	</p>
 
 	<p>
@@ -11,9 +11,9 @@
 
       <ul>
        <li>{t}The hostname of your LDAP server{/t}</li>
-       <li>{t}Installed GOsa and supplementary schemas{/t}</li>
+       <li>{t}Installed GOsa and supplementary schema{/t}</li>
        <li>{t}The LDAP base of your LDAP directory{/t}</li>
-       <li>{t}The DN and the password of the LDAP admin user{/t}</li>
+       <li>{t}The DN and the password of the LDAP administration user{/t}</li>
       </ul>
 	
 	<p>
-- 
2.30.2