From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 12 Sep 2005 05:30:48 +0000 (+0000)
Subject: some changes
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=32a8d5c174be932967a9a0cd1dbb28a96f809acd;p=gosa.git

some changes



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

diff --git a/TODO b/TODO
index 0daaf4794..1176b72d7 100644
--- a/TODO
+++ b/TODO
@@ -14,16 +14,9 @@ Things to fix before 2.4:
 
 * Check renaming of servers
 
-* Fix system dialog -> icons on top are not adapted yet, remove "create system"
-
 * Fix filter part of dialogs and remove long descriptive textx in front of the search
   fields
 
-* Phone plugin
-  -> macro for std dial -> where fore is phone number and voicemail number?
-     cleanup
-  -> layout broken, vertical align top is missing
-
 * Addressbook shows up with windows workstations
 
 
diff --git a/plugins/admin/FAI/askClassName.tpl b/plugins/admin/FAI/askClassName.tpl
index db55ed11e..8c28dd62d 100644
--- a/plugins/admin/FAI/askClassName.tpl
+++ b/plugins/admin/FAI/askClassName.tpl
@@ -4,7 +4,7 @@
 </div>
 	{t}Please select a class name for this object. The class name specifies a set of configurations.{/t}
 	<br>
-	{t}Every Class name must be unique. But it can be used for diffrent objects at the same time.\n
+	{t}Every Class name must be unique. But it can be used for different objects at the same time.\n
 	   If you use this class name in a profile, all object with this class name will be included to this profile.{/t}
 	<br>
 	<br>
@@ -14,7 +14,7 @@
 <table >
 	<tr>
 		<td colspan="2"><b>
-			{t}You can select one the following class names for this object.{/t}
+			{t}You can select of one the following class names for this object.{/t}
 		</b></td>
 	</tr>
 	<tr>
diff --git a/plugins/admin/FAI/class_askClassName.inc b/plugins/admin/FAI/class_askClassName.inc
index 15c87f0a4..7e0433bfb 100644
--- a/plugins/admin/FAI/class_askClassName.inc
+++ b/plugins/admin/FAI/class_askClassName.inc
@@ -71,7 +71,7 @@ class askClassName extends plugin
       case "FAIhook"          :  $str =_("Create new FAI object - set of hooks.");break;
       case "FAIprofile"       :  $str =_("Create new FAI object - profile.");break;
       case "FAItemplate"      :  $str =_("Create new FAI object - template.");break;
-      default                 :  $str =_("Create nre FAI object");break;
+      default                 :  $str =_("Create new FAI object");break;
     }
     $smarty->assign("headline",$str);
     
diff --git a/plugins/admin/FAI/class_faiManagement.inc b/plugins/admin/FAI/class_faiManagement.inc
index be3fad670..fcbb4196d 100644
--- a/plugins/admin/FAI/class_faiManagement.inc
+++ b/plugins/admin/FAI/class_faiManagement.inc
@@ -394,7 +394,7 @@ class faiManagement extends plugin
 		$divlist->SetHeader(array(
 					array("string" => "&nbsp;"),
 					array("string" => _("FAI objects / ObjectClasses")),
-					array("string" => _("Object type")),
+					array("string" => _("Object group")),
 					array("string" => _("Obtions"), "attach" => "style='border:none'" )));
 
 
@@ -435,7 +435,7 @@ class faiManagement extends plugin
 							$abort = true;
 						}
 					$img="<img src='images/fai_variable.png' title='Variable set' alt='V'>";
-					$info = _("Varialbe set");
+					$info = _("Variable set");
 					break;
 					case "FAIhook"				:
 						if(!$faifilter['ShowHooks']){ 
diff --git a/plugins/admin/FAI/remove.tpl b/plugins/admin/FAI/remove.tpl
index 9a8209038..2d1deeec4 100644
--- a/plugins/admin/FAI/remove.tpl
+++ b/plugins/admin/FAI/remove.tpl
@@ -4,7 +4,7 @@
 
 <p>
  {$warning}
- {t}This includes <b>all</b> system and setup informations. Please double check if your really want to do this since there is no way for GOsa to get your data back.{/t}
+ {t}This includes <b>all</b> object informations. Please double check if your really want to do this since there is no way for GOsa to get your data back.{/t}
 </p>
 
 <p>
diff --git a/plugins/gofon/phoneaccount/generic.tpl b/plugins/gofon/phoneaccount/generic.tpl
index 8ebe06f8b..382b55f72 100644
--- a/plugins/gofon/phoneaccount/generic.tpl
+++ b/plugins/gofon/phoneaccount/generic.tpl
@@ -20,7 +20,7 @@
 <table summary="" style="width:100%" border=0>
  <tr>
 
-  <td>
+  <td tyle="vertical-align:top;">
    <h2><img alt="" align="middle" src="images/hardware.png"> {t}Telephone hardware{/t}</h2>
 
    <table summary="{t}Telephone{/t}" border=0>
@@ -56,7 +56,7 @@
  </tr>
  <tr style="vertical-align:top; border-top:1px solid #A0A0A0;">
 	<td colspan=2 style="vertical-align:top;width:50%">
-		<img alt="" src="images/select_macro.png" align="middle">&nbsp;{t}Phone macro{/t}
+		<h2><img alt="" src="images/select_macro.png" align="middle">&nbsp;{t}Phone macro{/t}</h2>
 		<table summary="{t}Phone macro{/t}">
 			<tr>
 				<td colspan=2>