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 0daaf4794eb370185c2faa450455ba5808033581..1176b72d7f17e350143cb65c36f9ecc5468e6c1c 100644 (file)
--- 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 db55ed11e599fda7af349d072918323d9a624ebb..8c28dd62d6ff0c8cd53c3012e8dff422b91525c7 100644 (file)
--- 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 15c87f0a4fe9f379078d59a87eccdb1ec8cf4c81..7e0433bfb1a8455c5c75f98631940393efcc365f 100644 (file)
--- 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 be3fad670b0a06f8df2f089df9fc1c5a7434b73a..fcbb4196d0efe6cce0de7f8683a97d479b785aa1 100644 (file)
--- 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" => " "),
                                        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 9a8209038b257555db1b2f2218cecea11dcce9d2..2d1deeec49657d471a08be9bf91d0c66dae2d7f0 100644 (file)
--- 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 8ebe06f8bee1b085a846d482e2123a1dbad65866..382b55f72e97efbe5f46402473c2827817ef74f3 100644 (file)
--- 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>