From 3024e24c2ffe16409f6d1fc5df3ea1a07576aebf Mon Sep 17 00:00:00 2001
From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 28 Apr 2010 21:12:36 +0000
Subject: [PATCH] Some text cleanup

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@17917 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 gosa-core/contrib/gosa.conf                   | 45 ++++++------
 gosa-core/html/setup.php                      |  4 +-
 .../plugins/admin/ogroups/tabs_ogroups.inc    | 10 +--
 .../admin/users/class_userManagement.inc      |  2 +-
 .../personal/posix/class_posixAccount.inc     |  2 +-
 .../posix/trustSelect/class_trustSelect.inc   | 68 -------------------
 6 files changed, 31 insertions(+), 100 deletions(-)

diff --git a/gosa-core/contrib/gosa.conf b/gosa-core/contrib/gosa.conf
index 45a6bfd02..a6fcf2379 100644
--- a/gosa-core/contrib/gosa.conf
+++ b/gosa-core/contrib/gosa.conf
@@ -101,31 +101,30 @@
   <!-- User dialog -->
   <usertabs>
      <tab class="user" name="Generic" />
-     <tab class="posixAccount" name="Unix" />
-     <tab class="environment" name="Environment" />
-     <tab class="mailAccount" name="Mail" />
+     <tab class="posixAccount" name="POSIX" />
      <tab class="sambaAccount" name="Samba" />
      <tab class="netatalk" name="Netatalk" />
+     <tab class="mailAccount" name="Mail" />
+     <tab class="scalixAccount" name="Scalix" />
+     <tab class="environment" name="Desktop" />
      <tab class="connectivity" name="Connectivity" />
      <tab class="gofaxAccount" name="Fax" />
      <tab class="phoneAccount" name="Phone" />
-     <tab class="scalixAccount" name="Scalix" />
      <tab class="nagiosAccount" name="Nagios" /> 
    </usertabs>
 
   <!-- User dialog -->
   <MyAccountTabs>
-     <tab class="user" name="Generic" 
-      />
-     <tab class="posixAccount" name="Unix" />
-     <tab class="environment" name="Environment" />
-     <tab class="mailAccount" name="Mail" />
+     <tab class="user" name="Generic" />
+     <tab class="posixAccount" name="POSIX" />
      <tab class="sambaAccount" name="Samba" />
      <tab class="netatalk" name="Netatalk" />
+     <tab class="mailAccount" name="Mail" />
+     <tab class="scalixAccount" name="Scalix" />
+     <tab class="environment" name="Desktop" />
      <tab class="connectivity" name="Connectivity" />
      <tab class="gofaxAccount" name="Fax" />
      <tab class="phoneAccount" name="Phone" />
-     <tab class="scalixAccount" name="Scalix" />
      <tab class="nagiosAccount" name="Nagios" />
    </MyAccountTabs>
 
@@ -137,8 +136,8 @@
   <!-- Group dialog -->
   <grouptabs>
     <tab class="group" name="Generic" />
-    <tab class="environment" name="Environment" />
-    <tab class="appgroup" name="Applications" />
+    <tab class="environment" name="Desktop" />
+    <tab class="appgroup" name="Startmenu" />
     <tab class="mailgroup" name="Mail" />
   </grouptabs>
 
@@ -170,7 +169,7 @@
   <!-- GOto plugins -->
   <appstabs>
     <tab class="application" name="Generic" />
-    <tab class="applicationParameters" name="Options" />
+    <tab class="applicationParameters" name="Parameter" />
   </appstabs>
 
   <mimetabs>
@@ -187,14 +186,14 @@
 
   <termtabs>
      <tab class="termgeneric" name="Generic" />
-     <tab class="termstartup" name="Startup" />
+     <tab class="termstartup" name="Recipe" />
      <tab class="termservice" name="Devices" />
      <tab class="terminfo" name="Information" snmpCommunity="{$cv.optional.snmpcommunity}" />
   </termtabs>
 
   <servtabs>
      <tab class="servgeneric" name="Generic" />
-     <tab class="workstartup" name="Startup" />
+     <tab class="workstartup" name="Recipe" />
      <tab class="ServerService" name="Services" />
      <tab class="faiSummaryTab" name="Deployment summary" />
      <tab class="gotoLogView" name="Installation logs" />
@@ -203,7 +202,7 @@
 
   <worktabs>
      <tab class="workgeneric" name="Generic" />
-     <tab class="workstartup" name="Startup" />
+     <tab class="workstartup" name="Recipe" />
      <tab class="workservice" name="Devices" />
      <tab class="printgeneric" name="Printer" />
      <tab class="terminfo" name="Information" snmpCommunity="{$cv.optional.snmpcommunity}" />
@@ -327,7 +326,7 @@
   </faipartitiontabs>
 
   <faiscripttabs>
-    <tab class="faiScript" name="Script" />
+    <tab class="faiScript" name="Scripts" />
   </faiscripttabs>
 
   <faihooktabs>
@@ -352,15 +351,15 @@
   </faipackagetabs>
 
   <opsitabs>
-    <tab class="opsiGeneric" name="Opsi" />
-    <tab class="opsiSoftware" name="Hardware information" />
-    <tab class="opsiHardware" name="software information" />
-    <tab class="licenseUsageByHost" name="Usage"/>
+    <tab class="opsiGeneric" name="Generic" />
+    <tab class="opsiSoftware" name="Hardware" />
+    <tab class="opsiHardware" name="Software" />
+    <tab class="licenseUsageByHost" name="License usage"/>
   </opsitabs>
 
   <opsiprodconfig>
-    <tab class="opsiProperties" name="Config" />
-    <tab class="licenseByProduct" name="Usage"/>
+    <tab class="opsiProperties" name="Properties" />
+    <tab class="licenseByProduct" name="License usage"/>
   </opsiprodconfig>
 
   <!-- rSyslog plugin -->
diff --git a/gosa-core/html/setup.php b/gosa-core/html/setup.php
index 51c602143..477a3c7ec 100644
--- a/gosa-core/html/setup.php
+++ b/gosa-core/html/setup.php
@@ -63,8 +63,8 @@ $smarty->compile_dir= '/var/spool/gosa/';
 
 /* Check for compile directory */
 if (!(is_dir($smarty->compile_dir) && is_writable($smarty->compile_dir))){
-  msg_dialog::display(_("Smarty"),sprintf(_("Directory '%s' specified as compile directory is not accessible!"),
-    $smarty->compile_dir),FATAL_ERROR_DIALOG);
+  msg_dialog::display(_("Smarty"),sprintf( _("Compile directory %s is not accessible!"),
+    bold($smarty->compile_dir)),FATAL_ERROR_DIALOG);
   exit();
 }
 
diff --git a/gosa-core/plugins/admin/ogroups/tabs_ogroups.inc b/gosa-core/plugins/admin/ogroups/tabs_ogroups.inc
index 95a603cb6..b170ead50 100644
--- a/gosa-core/plugins/admin/ogroups/tabs_ogroups.inc
+++ b/gosa-core/plugins/admin/ogroups/tabs_ogroups.inc
@@ -160,7 +160,7 @@ class ogrouptabs extends tabs
             if(!$mixed_type && 
                     ((preg_match("/T/",$objects)) || (preg_match("/W/",$objects)))&&(!isset($this->by_object['termgroup']))){
                 if(!isset($this->by_object['termgroup'])){
-                    $this->by_name['termgroup']= _("Systems");
+                    $this->by_name['termgroup']= _("System settings");
                     $this->by_object['termgroup']= new termgroup($this->config, $this->dn);
                     $this->by_object['termgroup']->inheritTimeServer = false;
                     $this->by_object['termgroup']->parent= &$this;
@@ -172,7 +172,7 @@ class ogrouptabs extends tabs
             if(!$mixed_type &&
                     preg_match("/T/",$objects) &&(!isset($this->by_object['termstartup']))){
                 if(!isset($this->by_object['termstartup'])){
-                    $this->by_name['termstartup']= _("Startup");
+                    $this->by_name['termstartup']= _("Recipe");
                     $this->by_object['termstartup']= new termstartup($this->config, $this->dn,$this->by_object['ogroup']);
                     $this->by_object['termstartup']->parent= &$this;
                     $this->by_object['termstartup']->acl = "#all#";
@@ -197,7 +197,7 @@ class ogrouptabs extends tabs
         if(class_available("workstartup")){
             if(!$mixed_type &&
                     (preg_match("/S/",$objects) || preg_match("/W/",$objects))&&(!isset($this->by_object['workstartup']))){
-                $this->by_name['workstartup']= _("Startup");
+                $this->by_name['workstartup']= _("Recipe");
                 $this->by_object['workstartup']= new workstartup($this->config, $this->dn);
                 $this->by_object['workstartup']->parent= &$this;
                 $this->add("workstartup");
@@ -216,7 +216,7 @@ class ogrouptabs extends tabs
         if(class_available("faiSummary")){
             if(!$mixed_type &&
                     (preg_match("/S/",$objects) || preg_match("/W/",$objects))&&(!isset($this->by_object['faiSummary']))){
-                $this->by_name['faiSummary']= _("FAI summary");
+                $this->by_name['faiSummary']= _("Deployment summary");
                 $this->by_object['faiSummary']= new faiSummaryTab($this->config, $this->dn);
                 $this->by_object['faiSummary']->parent= &$this;
                 $this->add("faiSummary");
@@ -226,7 +226,7 @@ class ogrouptabs extends tabs
         /* Add environment tab if user or group is member in this object group*/
         if(class_available("environment")){
             if((preg_match("/G/",$objects) || preg_match("/U/",$objects)) && !isset($this->by_name['environment'])){
-                $this->by_name['environment']= _("Environment");
+                $this->by_name['environment']= _("Desktop");
                 $this->by_object['environment']= new environment($this->config, $this->dn);
                 $this->by_object['environment']->parent= &$this;
                 $this->add("environment");
diff --git a/gosa-core/plugins/admin/users/class_userManagement.inc b/gosa-core/plugins/admin/users/class_userManagement.inc
index ab0d22494..cb12ae26b 100644
--- a/gosa-core/plugins/admin/users/class_userManagement.inc
+++ b/gosa-core/plugins/admin/users/class_userManagement.inc
@@ -23,7 +23,7 @@
 class userManagement extends management
 {
   var $plHeadline     = "Users";
-  var $plDescription  = "Manage aspects of user accounts like generic, posix, samba and mail settings";
+  var $plDescription  = "Manage aspects of user accounts like generic, POSIX, samba and mail settings";
   var $plIcon  = "plugins/users/images/user.png";
 
   var $sn = "";
diff --git a/gosa-core/plugins/personal/posix/class_posixAccount.inc b/gosa-core/plugins/personal/posix/class_posixAccount.inc
index 8a9defd0e..7fe3dc6c5 100644
--- a/gosa-core/plugins/personal/posix/class_posixAccount.inc
+++ b/gosa-core/plugins/personal/posix/class_posixAccount.inc
@@ -34,7 +34,7 @@
 class posixAccount extends plugin
 {
   /* Definitions */
-  var $plHeadline= "UNIX";
+  var $plHeadline= "POSIX";
   var $plDescription= "Edit users POSIX settings";
 
   /* Plugin specific values */
diff --git a/gosa-core/plugins/personal/posix/trustSelect/class_trustSelect.inc b/gosa-core/plugins/personal/posix/trustSelect/class_trustSelect.inc
index f98e0b096..9b449a81c 100644
--- a/gosa-core/plugins/personal/posix/trustSelect/class_trustSelect.inc
+++ b/gosa-core/plugins/personal/posix/trustSelect/class_trustSelect.inc
@@ -51,74 +51,6 @@ class trustSelect extends management
     parent::__construct($config, $ui, "groups", $headpage);
   }
 
-
-  static function filterProperties($row, $classes)
-  {
-    $result= "";
-
-    $map = array(
-        "posixGroup" => 
-        array(
-          "image" => "plugins/groups/images/select_group.png",
-          "plugin" => "group",
-          "alt" => _("Posix"),
-          "title" => _("Edit posix properties")
-          ),
-
-        "gosaMailAccount" => 
-        array(
-          "image" => "plugins/groups/images/mail.png",
-          "plugin" => "mailgroup",
-          "alt" => _("Mail"),
-          "title" => _("Edit mail properties")
-          ),
-
-        "sambaGroupMapping" => 
-        array(
-          "image" => "plugins/groups/images/samba.png",
-          "plugin" => "group",
-          "alt" => _("Samba"),
-          "title" => _("Edit samba properties")
-          ),
-
-        "goFonPickupGroup" => 
-          array(
-              "image" => "plugins/groups/images/asterisk.png",
-              "plugin" => "group",
-              "alt" => _("Phone"),
-              "title" => _("Edit phone properties")
-              ),
-
-        "gotoMenuGroup" => 
-          array(
-              "image" => "plugins/groups/images/menu.png",
-              "plugin" => "appgroup",
-              "alt" => _("Menu"),
-              "title" => _("Edit start menu properties")
-              ),
-
-        "gotoEnvironment" => 
-          array(
-              "image" => "plugins/groups/images/environment.png",
-              "plugin" => "environment",
-              "alt" => _("Environment"),
-              "title" => _("Edit environment properties")
-              )
-          );
-
-
-    // Walk thru map
-    foreach ($map as $oc => $properties) {
-      if (in_array_ics($oc, $classes)) {
-        $result.="<input class='center' type='image' src='".$properties['image']."' ".
-          "alt='".$properties['alt']."' title='".$properties['title'].
-          "' name='listing_edit_".$properties['plugin']."_$row' style='padding:1px'>";
-      } else {
-        $result.="<img src='images/empty.png' alt=' ' class='center' style='padding:1px'>";
-      }
-    }
-    return $result;
-  }
 } 
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>
-- 
2.30.2