Updated strings

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

diff --git a/include/functions.inc b/include/functions.inc
index 89dfcf29ac328016fba75b95f0a1ce88d239a742..2e17cc4a9f9a0c7fbf3659f5df89b67eac8b78b0 100644 (file)
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -1528,7 +1528,7 @@ function gosaRaiseError($errno, $errstr, $errfile, $errline)
     if ($_SESSION['js']==FALSE){
       $error_collector= "<div>";
     } else {
-      $error_collector= "<table style='width:100%;background-color:#E0E0E0;border-bottom:1px solid black'><tr><td><img align=center src='".get_template_path('images/warning.png')."'>&nbsp;<font style='font-size:14px;font-weight:bold'>"._("Generating this page caused the PHP interpreter to rise some errors!")."</font></td><td align=right><button onClick='toggle(\"errorbox\")'>"._("Toggle information")."</button></td></tr></table><div id='errorbox' style='position:absolute; z-index:0; visibility: hidden'>";
+      $error_collector= "<table style='width:100%;background-color:#E0E0E0;border-bottom:1px solid black'><tr><td><img align=center src='".get_template_path('images/warning.png')."'>&nbsp;<font style='font-size:14px;font-weight:bold'>"._("Generating this page caused the PHP interpreter to raise some errors!")."</font></td><td align=right><button onClick='toggle(\"errorbox\")'>"._("Toggle information")."</button></td></tr></table><div id='errorbox' style='position:absolute; z-index:0; visibility: hidden'>";
     }
   }
  

diff --git a/include/setup_checks.inc b/include/setup_checks.inc
index 555b3593c864f00aee628b69e5b565a1cd598f8c..bb614f1e6374a8f82c8fbad70b10e84b45bcebdb 100644 (file)
--- a/include/setup_checks.inc
+++ b/include/setup_checks.inc
@@ -379,42 +379,43 @@ $register_globals =       ($arra['register_globals']);
 
 
 // auto_register
-$msg.= check (  $faults, _("PHP.ini check -> session.auto_register"),
-      _("In Order to use GOsa without any trouble, the session.auto_register option in your php.ini musst be 'Off'."),
-      (!$session_auto_start['local_value']));
+$msg.= check (  $faults, _("php.ini check -> session.auto_register"),
+    _("In Order to use GOsa without any trouble, the session.auto_register option in your php.ini must be set to 'Off'."), (!$session_auto_start['local_value']));
 
 
 
 //implicit_flush
-$msg.= check (  $faults, _("PHP.ini check -> implicit_flush"),
-      _("This Option defines the Ouput handling, turn this Option off, to increase performance."),
-        !$implicit_flush['local_value'],0,false);
+$msg.= check (  $faults, _("php.ini check -> implicit_flush"),
+    _("This option influences the Output handling. Turn this Option off, to increase performance."),
+    !$implicit_flush['local_value'],0,false);
 
 //max_execution_time
-if($max_execution_time['local_value'] < 30 )
+if($max_execution_time['local_value'] < 30 ){
   $max_execution_time['local_value']=false;
-$msg.= check (  $faults, _("PHP.ini check -> max_execution_time"),
-      _("The Execution time, should be 30 seconds minimun, cause some actions will need huge ammount of time ."),
-        $max_execution_time['local_value'],0,false);
+}
+$msg.= check (  $faults, _("php.ini check -> max_execution_time"),
+    _("The Execution time should be at least 30 seconds, because some actions may consume more time."),
+    $max_execution_time['local_value'],0,false);
 
 //memory_limit
-if($memory_limit['local_value'] < 8 )
+if($memory_limit['local_value'] < 8 ){
   $memory_limit['local_value']=false;
-$msg.= check (  $faults, _("PHP.ini check -> memory_limit"),
-      _("GOsa need at least 8M of memory, less will cause unpredictable errors, sometimes without error message!. Best would be 32 M here."),
-        !$implicit_flush['local_value'],0,false);
+}
+$msg.= check (  $faults, _("php.ini check -> memory_limit"),
+    _("GOsa needs at least 8MB of memory, less will cause unpredictable errors! An optimal setting would be 16MB, increase it for larger setups."),
+    !$implicit_flush['local_value'],0,false);
 
 //expose_php
-$msg.= check (  $faults, _("PHP.ini check -> expose_php"),
-      _("PHP won't send any Information about the Server you are running, should be a security fact."),
-        !$implicit_flush['local_value'],0,false);
+$msg.= check (  $faults, _("php.ini check -> expose_php"),
+    _("Increase the server security by setting expose_php to 'off'. PHP won't send any Information about the server you are running in this case."),
+    !$implicit_flush['local_value'],0,false);
 
 //magic_quotes_gpc
-$msg.= check (  $faults, _("PHP.ini check -> magic_quotes_gpc"),
-      _("Security option, php will escape all quotes in strings ."),
-        $magic_quotes_gpc['local_value'],0,false);
+$msg.= check (  $faults, _("php.ini check -> magic_quotes_gpc"),
+    _("Increase your server security by setting magic_quotes_gpc to 'on'. PHP will escape all quotes in strings in this case."),
+    $magic_quotes_gpc['local_value'],0,false);
 
-  return $msg;
+return $msg;
 }
 
 

diff --git a/plugins/admin/ogroups/class_ogroup.inc b/plugins/admin/ogroups/class_ogroup.inc
index fcf55b33988aa9e186a5a97e7cc852c2fec42780..32dba79b58effb0c53484e0c5f72721120256745 100644 (file)
--- a/plugins/admin/ogroups/class_ogroup.inc
+++ b/plugins/admin/ogroups/class_ogroup.inc
@@ -180,6 +180,7 @@ class ogroup extends plugin
         $smarty->assign("$type", $ogfilter[$type]);
       }
       $smarty->assign("hint", print_sizelimit_warning());
+      $smarty->assign("apply", apply_filter());
 
       $display= $smarty->fetch (get_template_path('ogroup_objects.tpl', TRUE, dirname(__FILE__)));
       return ($display);
@@ -240,6 +241,11 @@ class ogroup extends plugin
       $smarty->assign("$val"."ACL", chkacl($this->acl, "$val"));
     }
 
+    /* Assign ACL's */
+    foreach (array("base", "members") as $val){
+      $smarty->assign("$val"."ACL", chkacl($this->acl, "$val"));
+    }
+
     return ($smarty->fetch (get_template_path('generic.tpl', TRUE)));
   }
 

diff --git a/plugins/admin/ogroups/class_termgroup.inc b/plugins/admin/ogroups/class_termgroup.inc
index e493341eac788d83999208ccc150951d96b2fa1a..667e820b9421b083fa592bed3e4da1d5fc0d0213 100644 (file)
--- a/plugins/admin/ogroups/class_termgroup.inc
+++ b/plugins/admin/ogroups/class_termgroup.inc
@@ -89,6 +89,7 @@ class termgroup extends plugin
     $smarty= get_smarty();
 
     $smarty->assign("actions", array("wake" => _("Wake up"), "halt" => _("Switch off"), "reboot" => _("Reboot")));
+    $smarty->assign("actionACL", chkacl($this->acl, 'action'));
 
     /* Show main page */
     return ($smarty->fetch (get_template_path('termgroup.tpl', TRUE)));

diff --git a/plugins/admin/ogroups/generic.tpl b/plugins/admin/ogroups/generic.tpl
index 1ffcde654dcb6a22a28d6b40b8c402ac2dadfd84..f39dcd446f629138b7e51dd8a72ba907a5b02d28 100644 (file)
--- a/plugins/admin/ogroups/generic.tpl
+++ b/plugins/admin/ogroups/generic.tpl
@@ -20,7 +20,7 @@
     <tr>
      <td>{t}Base{/t}{$must}</td>
      <td>
-      <select size="1" name="base" {$selectmode} title="{t}Choose subtree to place group in{/t}">
+      <select size="1" name="base" {$baseACL} title="{t}Choose subtree to place group in{/t}">
        {html_options options=$bases selected=$base_select}
       </select>
      </td>